From f001836c5e192d4dffc032bc5641ed170d9c3ed9 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 4 Apr 2019 14:15:39 +0200 Subject: [PATCH] AutoTest: Fix handling of internal messages after disabled tests Internal messages which came right after the message of disabled tests got the wrong parent and therefore had never been displayed. Change-Id: Ibfdf75ae720b31149b6fdf2eb625814690aa9a53 Reviewed-by: David Schulz --- 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 51eb81a4556..645f1af0a87 100644 --- a/src/plugins/autotest/gtest/gtestresult.cpp +++ b/src/plugins/autotest/gtest/gtestresult.cpp @@ -68,6 +68,8 @@ bool GTestResult::isDirectParentOf(const TestResult *other, bool *needsIntermedi if (!TestResult::isDirectParentOf(other, needsIntermediate)) return false; + if (result() == Result::MessageDisabledTests) + return false; const GTestResult *gtOther = static_cast(other); if (m_testSetName == gtOther->m_testSetName) { const Result::Type otherResult = other->result();