From 3c0f61ef0b24833fd996b1de785884c70bfedd7f Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Wed, 20 Jun 2018 14:27:10 +0200
Subject: [PATCH] AutoTest: Use correct parent for duration results

When using google test the duration results have been
added to the respective test case instead of the test set.
Take test set information into account as well.

Change-Id: Iacc647b9dd75daf197b92f50c704916c116e6977
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/autotest/gtest/gtestresult.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/autotest/gtest/gtestresult.cpp b/src/plugins/autotest/gtest/gtestresult.cpp
index 9ffd361ce62..98ca4d80089 100644
--- a/src/plugins/autotest/gtest/gtestresult.cpp
+++ b/src/plugins/autotest/gtest/gtestresult.cpp
@@ -69,6 +69,8 @@ bool GTestResult::isDirectParentOf(const TestResult *other, bool *needsIntermedi
         return false;
 
     const GTestResult *gtOther = static_cast<const GTestResult *>(other);
+    if (m_testSetName == gtOther->m_testSetName && other->result() == Result::MessageInternal)
+        return true;
     if (m_iteration != gtOther->m_iteration)
         return false;
     return isTest() && gtOther->isTestSet();