feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AutoTest: Use correct parent for duration results

Browse Source 
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>
This commit is contained in:
Christian Stenger
2018-06-20 14:27:10 +02:00
committed by David Schulz
parent 34e803c542
commit 3c0f61ef0b
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotest/gtest/gtestresult.cpp
View File

@@ -69,6 +69,8 @@ bool GTestResult::isDirectParentOf(const TestResult *other, bool *needsIntermedi
return false; return false;
const GTestResult *gtOther = static_cast<const GTestResult *>(other); 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) if (m_iteration != gtOther->m_iteration)
return false; return false;
return isTest() && gtOther->isTestSet(); return isTest() && gtOther->isTestSet();