From 308280e7a9277334c2fd3480c3ddc4971d85b920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 3 Aug 2021 12:50:26 +0200 Subject: [PATCH] testlib: Move stdout/stderr reporting into individual elements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The original Ant JUnit reporter only writes and to the , but more modern reporters such as Maven Surefire scopes output to each individual . This is also handled by both the Jenkins JUnit and xUnit plugins, e.g.: https://github.com/jenkinsci/junit-plugin/commit/145eb5c98 Pick-to: 6.2 Change-Id: I20c87276004a4e0910fc18e05e6ffa0f5e5a7b7c Reviewed-by: Mårten Nordheim Reviewed-by: Edward Welbourne --- src/testlib/qjunittestlogger.cpp | 24 +- .../selftests/expected_assert.junitxml | 2 - .../selftests/expected_badxml.junitxml | 55 +- .../expected_benchlibcallgrind.junitxml | 2 - .../expected_benchlibcounting.junitxml | 2 - .../expected_benchlibeventcounter.junitxml | 2 - .../expected_benchliboptions.junitxml | 6 - .../expected_benchlibtickcounter.junitxml | 2 - .../expected_benchlibwalltime.junitxml | 2 - .../selftests/expected_blacklisted.junitxml | 2 - .../selftests/expected_cmptest.junitxml | 2 - .../expected_commandlinedata.junitxml | 27 +- .../selftests/expected_counting.junitxml | 11 +- .../selftests/expected_datatable.junitxml | 2 - .../selftests/expected_datetime.junitxml | 2 - .../expected_exceptionthrow.junitxml | 2 - .../selftests/expected_expectfail.junitxml | 47 +- .../selftests/expected_failcleanup.junitxml | 2 - .../selftests/expected_faildatatype.junitxml | 7 +- .../selftests/expected_failfetchtype.junitxml | 2 - .../selftests/expected_failinit.junitxml | 2 - .../selftests/expected_failinitdata.junitxml | 2 - .../selftests/expected_fetchbogus.junitxml | 2 - .../selftests/expected_findtestdata.junitxml | 7 +- .../selftests/expected_globaldata.junitxml | 103 +- .../testlib/selftests/expected_junit.junitxml | 20 +- .../selftests/expected_keyboard.junitxml | 2 - .../selftests/expected_longstring.junitxml | 2 - .../selftests/expected_maxwarnings.junitxml | 4012 ++++++++--------- .../selftests/expected_multiexec.junitxml | 10 - .../expected_pairdiagnostics.junitxml | 2 - .../testlib/selftests/expected_pass.junitxml | 2 - .../expected_qexecstringlist.junitxml | 2 - .../selftests/expected_signaldumper.junitxml | 289 +- .../selftests/expected_singleskip.junitxml | 2 - .../testlib/selftests/expected_skip.junitxml | 7 +- .../selftests/expected_skipcleanup.junitxml | 2 - .../selftests/expected_skipinit.junitxml | 2 - .../selftests/expected_skipinitdata.junitxml | 2 - .../testlib/selftests/expected_sleep.junitxml | 2 - .../selftests/expected_strcmp.junitxml | 11 +- .../selftests/expected_subtest.junitxml | 83 +- .../selftests/expected_testlib.junitxml | 2 - .../expected_tuplediagnostics.junitxml | 2 - .../selftests/expected_verbose1.junitxml | 11 +- .../selftests/expected_verbose2.junitxml | 71 +- .../expected_verifyexceptionthrown.junitxml | 2 - .../selftests/expected_warnings.junitxml | 50 +- .../selftests/expected_watchdog.junitxml | 2 - 49 files changed, 2501 insertions(+), 2410 deletions(-) diff --git a/src/testlib/qjunittestlogger.cpp b/src/testlib/qjunittestlogger.cpp index bc384a7af21..795017ef184 100644 --- a/src/testlib/qjunittestlogger.cpp +++ b/src/testlib/qjunittestlogger.cpp @@ -87,10 +87,6 @@ void QJUnitTestLogger::startLogging() QAbstractTestLogger::startLogging(); logFormatter = new QTestJUnitStreamer(this); - delete systemOutputElement; - systemOutputElement = new QTestElement(QTest::LET_SystemOutput); - delete systemErrorElement; - systemErrorElement = new QTestElement(QTest::LET_SystemError); Q_ASSERT(!currentTestSuite); currentTestSuite = new QTestElement(QTest::LET_TestSuite); @@ -154,9 +150,6 @@ void QJUnitTestLogger::stopLogging() testcase = testcase->nextElement(); } - currentTestSuite->addLogElement(systemOutputElement); - currentTestSuite->addLogElement(systemErrorElement); - logFormatter->output(currentTestSuite); delete currentTestSuite; @@ -177,6 +170,10 @@ void QJUnitTestLogger::enterTestCase(const char *name) currentTestCase->addAttribute(QTest::AI_Classname, QTestResult::currentTestObjectName()); currentTestCase->addToList(&listOfTestcases); + Q_ASSERT(!systemOutputElement && !systemErrorElement); + systemOutputElement = new QTestElement(QTest::LET_SystemOutput); + systemErrorElement = new QTestElement(QTest::LET_SystemError); + // The element will be deleted when the suite is deleted ++testCounter; @@ -214,6 +211,19 @@ void QJUnitTestLogger::leaveTestCase() { currentTestCase->addAttribute(QTest::AI_Time, toSecondsFormat(elapsedTestCaseSeconds()).constData()); + + if (systemOutputElement->childElements()) + currentTestCase->addLogElement(systemOutputElement); + else + delete systemOutputElement; + + if (systemErrorElement->childElements()) + currentTestCase->addLogElement(systemErrorElement); + else + delete systemErrorElement; + + systemOutputElement = nullptr; + systemErrorElement = nullptr; } void QJUnitTestLogger::addIncident(IncidentTypes type, const char *description, diff --git a/tests/auto/testlib/selftests/expected_assert.junitxml b/tests/auto/testlib/selftests/expected_assert.junitxml index b000a0decce..e97f123d5b3 100644 --- a/tests/auto/testlib/selftests/expected_assert.junitxml +++ b/tests/auto/testlib/selftests/expected_assert.junitxml @@ -10,6 +10,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_badxml.junitxml b/tests/auto/testlib/selftests/expected_badxml.junitxml index 0e7f5403025..9c8b9d4e68d 100644 --- a/tests/auto/testlib/selftests/expected_badxml.junitxml +++ b/tests/auto/testlib/selftests/expected_badxml.junitxml @@ -9,64 +9,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + text ]]]> more text]]> + + + + + + open < tags < text]]> + + + " mixed ]]]> up > " in < the ]]]> hopes < of triggering "< ]]]> bugs]]> + + + + - - - - - - - - - - text ]]]> more text]]> - - open < tags < text]]> - " mixed ]]]> up > " in < the ]]]> hopes < of triggering "< ]]]> bugs]]> - - - diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml index e2309d583f8..0850e747337 100644 --- a/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml +++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml @@ -10,6 +10,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml b/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml index c542a491cce..4467df6927e 100644 --- a/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml +++ b/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml @@ -14,6 +14,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml index 9dccff69a41..e2f9e5ce50c 100644 --- a/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml +++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml @@ -14,6 +14,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_benchliboptions.junitxml b/tests/auto/testlib/selftests/expected_benchliboptions.junitxml index d7269f7b55d..4c1b28d7071 100644 --- a/tests/auto/testlib/selftests/expected_benchliboptions.junitxml +++ b/tests/auto/testlib/selftests/expected_benchliboptions.junitxml @@ -8,8 +8,6 @@ - - @@ -21,8 +19,6 @@ - - @@ -34,6 +30,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml index afb0a97b8b3..ee065960062 100644 --- a/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml +++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml @@ -8,6 +8,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml b/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml index 6ca6fd40dcb..3cf3af4c4c4 100644 --- a/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml +++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml @@ -10,6 +10,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_blacklisted.junitxml b/tests/auto/testlib/selftests/expected_blacklisted.junitxml index 3a90685794d..bc268a80418 100644 --- a/tests/auto/testlib/selftests/expected_blacklisted.junitxml +++ b/tests/auto/testlib/selftests/expected_blacklisted.junitxml @@ -14,6 +14,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_cmptest.junitxml b/tests/auto/testlib/selftests/expected_cmptest.junitxml index cc1e4432050..9509c067e2b 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.junitxml +++ b/tests/auto/testlib/selftests/expected_cmptest.junitxml @@ -284,6 +284,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.junitxml b/tests/auto/testlib/selftests/expected_commandlinedata.junitxml index 46705d7cbf3..4e854fc649d 100644 --- a/tests/auto/testlib/selftests/expected_commandlinedata.junitxml +++ b/tests/auto/testlib/selftests/expected_commandlinedata.junitxml @@ -8,31 +8,40 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_counting.junitxml b/tests/auto/testlib/selftests/expected_counting.junitxml index 623fe912a2a..624d969f3d5 100644 --- a/tests/auto/testlib/selftests/expected_counting.junitxml +++ b/tests/auto/testlib/selftests/expected_counting.junitxml @@ -57,6 +57,9 @@ + + + @@ -68,12 +71,10 @@ + + + - - - - - diff --git a/tests/auto/testlib/selftests/expected_datatable.junitxml b/tests/auto/testlib/selftests/expected_datatable.junitxml index 0a938441462..17ecd437ba2 100644 --- a/tests/auto/testlib/selftests/expected_datatable.junitxml +++ b/tests/auto/testlib/selftests/expected_datatable.junitxml @@ -65,6 +65,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_datetime.junitxml b/tests/auto/testlib/selftests/expected_datetime.junitxml index 989ebcce34e..028834ac5ab 100644 --- a/tests/auto/testlib/selftests/expected_datetime.junitxml +++ b/tests/auto/testlib/selftests/expected_datetime.junitxml @@ -27,6 +27,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml b/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml index 8f0b6410f25..918c861e19d 100644 --- a/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml +++ b/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml @@ -9,6 +9,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_expectfail.junitxml b/tests/auto/testlib/selftests/expected_expectfail.junitxml index 1a35ac0be44..f14b1bf800e 100644 --- a/tests/auto/testlib/selftests/expected_expectfail.junitxml +++ b/tests/auto/testlib/selftests/expected_expectfail.junitxml @@ -10,10 +10,19 @@ + + + + + + + + + @@ -21,29 +30,51 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -63,20 +94,4 @@ - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_failcleanup.junitxml b/tests/auto/testlib/selftests/expected_failcleanup.junitxml index 059353c7dfd..a40c724a46c 100644 --- a/tests/auto/testlib/selftests/expected_failcleanup.junitxml +++ b/tests/auto/testlib/selftests/expected_failcleanup.junitxml @@ -10,6 +10,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_faildatatype.junitxml b/tests/auto/testlib/selftests/expected_faildatatype.junitxml index 697fe1e7591..b370e982b7b 100644 --- a/tests/auto/testlib/selftests/expected_faildatatype.junitxml +++ b/tests/auto/testlib/selftests/expected_faildatatype.junitxml @@ -9,9 +9,8 @@ + + + - - - - diff --git a/tests/auto/testlib/selftests/expected_failfetchtype.junitxml b/tests/auto/testlib/selftests/expected_failfetchtype.junitxml index f7c0bb72cb3..c1452c88fb8 100644 --- a/tests/auto/testlib/selftests/expected_failfetchtype.junitxml +++ b/tests/auto/testlib/selftests/expected_failfetchtype.junitxml @@ -9,6 +9,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_failinit.junitxml b/tests/auto/testlib/selftests/expected_failinit.junitxml index f0a6d2f528b..0d2091789b9 100644 --- a/tests/auto/testlib/selftests/expected_failinit.junitxml +++ b/tests/auto/testlib/selftests/expected_failinit.junitxml @@ -9,6 +9,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_failinitdata.junitxml b/tests/auto/testlib/selftests/expected_failinitdata.junitxml index b57d3f8fd37..640ddf52d99 100644 --- a/tests/auto/testlib/selftests/expected_failinitdata.junitxml +++ b/tests/auto/testlib/selftests/expected_failinitdata.junitxml @@ -8,6 +8,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.junitxml b/tests/auto/testlib/selftests/expected_fetchbogus.junitxml index 96f8df5fbd3..7a3c2f38a9a 100644 --- a/tests/auto/testlib/selftests/expected_fetchbogus.junitxml +++ b/tests/auto/testlib/selftests/expected_fetchbogus.junitxml @@ -9,6 +9,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_findtestdata.junitxml b/tests/auto/testlib/selftests/expected_findtestdata.junitxml index aa910d204d4..ca20c1aa3a7 100644 --- a/tests/auto/testlib/selftests/expected_findtestdata.junitxml +++ b/tests/auto/testlib/selftests/expected_findtestdata.junitxml @@ -8,10 +8,9 @@ + + + - - - - diff --git a/tests/auto/testlib/selftests/expected_globaldata.junitxml b/tests/auto/testlib/selftests/expected_globaldata.junitxml index 2b7a7efe4c4..cbf55d5018e 100644 --- a/tests/auto/testlib/selftests/expected_globaldata.junitxml +++ b/tests/auto/testlib/selftests/expected_globaldata.junitxml @@ -7,30 +7,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -39,82 +66,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_junit.junitxml b/tests/auto/testlib/selftests/expected_junit.junitxml index 5ee63b5d922..43d2bdae89b 100644 --- a/tests/auto/testlib/selftests/expected_junit.junitxml +++ b/tests/auto/testlib/selftests/expected_junit.junitxml @@ -8,6 +8,9 @@ + + + @@ -15,6 +18,9 @@ + + ]]> + @@ -24,20 +30,18 @@ + + + + + + - - ]]> - - - - - - diff --git a/tests/auto/testlib/selftests/expected_keyboard.junitxml b/tests/auto/testlib/selftests/expected_keyboard.junitxml index b34c710e246..486f4f85cb3 100644 --- a/tests/auto/testlib/selftests/expected_keyboard.junitxml +++ b/tests/auto/testlib/selftests/expected_keyboard.junitxml @@ -8,6 +8,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_longstring.junitxml b/tests/auto/testlib/selftests/expected_longstring.junitxml index 67136d4c5e1..88e2f079543 100644 --- a/tests/auto/testlib/selftests/expected_longstring.junitxml +++ b/tests/auto/testlib/selftests/expected_longstring.junitxml @@ -19,6 +19,4 @@ Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitu - - diff --git a/tests/auto/testlib/selftests/expected_maxwarnings.junitxml b/tests/auto/testlib/selftests/expected_maxwarnings.junitxml index c40c19e5cba..361b8969749 100644 --- a/tests/auto/testlib/selftests/expected_maxwarnings.junitxml +++ b/tests/auto/testlib/selftests/expected_maxwarnings.junitxml @@ -2009,2012 +2009,2012 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_multiexec.junitxml b/tests/auto/testlib/selftests/expected_multiexec.junitxml index 0c0852aa1ed..3b8db5466f0 100644 --- a/tests/auto/testlib/selftests/expected_multiexec.junitxml +++ b/tests/auto/testlib/selftests/expected_multiexec.junitxml @@ -8,8 +8,6 @@ - - @@ -21,8 +19,6 @@ - - @@ -34,8 +30,6 @@ - - @@ -47,8 +41,6 @@ - - @@ -60,6 +52,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml b/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml index dfd51a97382..d546d4d1bae 100644 --- a/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml +++ b/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml @@ -19,6 +19,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_pass.junitxml b/tests/auto/testlib/selftests/expected_pass.junitxml index 7d9d034c27c..36497693a0c 100644 --- a/tests/auto/testlib/selftests/expected_pass.junitxml +++ b/tests/auto/testlib/selftests/expected_pass.junitxml @@ -10,6 +10,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml b/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml index 10b86be4a81..dfe937d59a8 100644 --- a/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml +++ b/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml @@ -12,8 +12,6 @@ - - ********* Start testing of tst_QExecStringList ********* Config: Using QtTest library diff --git a/tests/auto/testlib/selftests/expected_signaldumper.junitxml b/tests/auto/testlib/selftests/expected_signaldumper.junitxml index f68c2633740..f345ab67a63 100644 --- a/tests/auto/testlib/selftests/expected_signaldumper.junitxml +++ b/tests/auto/testlib/selftests/expected_signaldumper.junitxml @@ -9,6 +9,10 @@ + + + + @@ -17,6 +21,14 @@ + + + + + + + + @@ -25,6 +37,14 @@ + + + + + + + + @@ -36,6 +56,17 @@ + + + + + + + + + + + @@ -44,6 +75,14 @@ + + + + + + + + @@ -52,6 +91,14 @@ + + + + + + + + @@ -60,6 +107,14 @@ + + + + + + + + @@ -74,6 +129,20 @@ + + + + + + + + + + + + + + @@ -82,6 +151,14 @@ + + + + + + + + @@ -93,6 +170,17 @@ + + + + + + + + + + + @@ -104,6 +192,17 @@ + + + + + + + + + + + @@ -118,6 +217,20 @@ + + + + + + + + + + + + + + @@ -129,27 +242,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -164,136 +309,26 @@ + + + + + + ())]]> + ())]]> + &)@_POINTER_)]]> + ())]]> + *)_POINTER_)]]> + *)_POINTER_)]]> + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ())]]> - ())]]> - &)@_POINTER_)]]> - ())]]> - *)_POINTER_)]]> - *)_POINTER_)]]> - - - - - diff --git a/tests/auto/testlib/selftests/expected_singleskip.junitxml b/tests/auto/testlib/selftests/expected_singleskip.junitxml index b41884fc3e8..9aff11d8807 100644 --- a/tests/auto/testlib/selftests/expected_singleskip.junitxml +++ b/tests/auto/testlib/selftests/expected_singleskip.junitxml @@ -10,6 +10,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_skip.junitxml b/tests/auto/testlib/selftests/expected_skip.junitxml index ddc7d762812..0fe2e0bad5f 100644 --- a/tests/auto/testlib/selftests/expected_skip.junitxml +++ b/tests/auto/testlib/selftests/expected_skip.junitxml @@ -17,10 +17,9 @@ + + + - - - - diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.junitxml b/tests/auto/testlib/selftests/expected_skipcleanup.junitxml index 4ae58e6e14a..88a5c250ffc 100644 --- a/tests/auto/testlib/selftests/expected_skipcleanup.junitxml +++ b/tests/auto/testlib/selftests/expected_skipcleanup.junitxml @@ -10,6 +10,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_skipinit.junitxml b/tests/auto/testlib/selftests/expected_skipinit.junitxml index f7d2b5a1240..ef653cd6013 100644 --- a/tests/auto/testlib/selftests/expected_skipinit.junitxml +++ b/tests/auto/testlib/selftests/expected_skipinit.junitxml @@ -9,6 +9,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.junitxml b/tests/auto/testlib/selftests/expected_skipinitdata.junitxml index c434ee157ad..4af4fbb142c 100644 --- a/tests/auto/testlib/selftests/expected_skipinitdata.junitxml +++ b/tests/auto/testlib/selftests/expected_skipinitdata.junitxml @@ -8,6 +8,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_sleep.junitxml b/tests/auto/testlib/selftests/expected_sleep.junitxml index ba6cfa8c3aa..c635cdc772b 100644 --- a/tests/auto/testlib/selftests/expected_sleep.junitxml +++ b/tests/auto/testlib/selftests/expected_sleep.junitxml @@ -9,6 +9,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_strcmp.junitxml b/tests/auto/testlib/selftests/expected_strcmp.junitxml index 480514adc76..1ac8a4dd922 100644 --- a/tests/auto/testlib/selftests/expected_strcmp.junitxml +++ b/tests/auto/testlib/selftests/expected_strcmp.junitxml @@ -15,6 +15,11 @@ + + + + + @@ -41,10 +46,4 @@ - - - - - - diff --git a/tests/auto/testlib/selftests/expected_subtest.junitxml b/tests/auto/testlib/selftests/expected_subtest.junitxml index f5b7bde44dd..1d77ffc9857 100644 --- a/tests/auto/testlib/selftests/expected_subtest.junitxml +++ b/tests/auto/testlib/selftests/expected_subtest.junitxml @@ -7,11 +7,19 @@ + + + + + + + + @@ -20,18 +28,38 @@ + + + + + + + + + + + + + + + + + + + + @@ -40,6 +68,14 @@ + + + + + + + + @@ -49,6 +85,11 @@ Expected (QString("hello0")): "hello0"]]> + + + + + @@ -58,42 +99,16 @@ Expected (QString("hello0")): "hello0"]]> + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_testlib.junitxml b/tests/auto/testlib/selftests/expected_testlib.junitxml index 1008c4ea70e..8e5bd0e37e0 100644 --- a/tests/auto/testlib/selftests/expected_testlib.junitxml +++ b/tests/auto/testlib/selftests/expected_testlib.junitxml @@ -17,6 +17,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml b/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml index e7273223075..7ebbe3b33a3 100644 --- a/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml +++ b/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml @@ -20,6 +20,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_verbose1.junitxml b/tests/auto/testlib/selftests/expected_verbose1.junitxml index 623fe912a2a..624d969f3d5 100644 --- a/tests/auto/testlib/selftests/expected_verbose1.junitxml +++ b/tests/auto/testlib/selftests/expected_verbose1.junitxml @@ -57,6 +57,9 @@ + + + @@ -68,12 +71,10 @@ + + + - - - - - diff --git a/tests/auto/testlib/selftests/expected_verbose2.junitxml b/tests/auto/testlib/selftests/expected_verbose2.junitxml index 843ac9ddb0c..03460248b69 100644 --- a/tests/auto/testlib/selftests/expected_verbose2.junitxml +++ b/tests/auto/testlib/selftests/expected_verbose2.junitxml @@ -9,14 +9,26 @@ + + + + + + + + + + + + @@ -24,10 +36,17 @@ + + + + + + + @@ -35,6 +54,10 @@ + + + + @@ -48,18 +71,31 @@ + + + + + + + + + + + + + @@ -67,10 +103,16 @@ + + + + + + @@ -81,6 +123,9 @@ + + + @@ -92,30 +137,10 @@ + + + - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml index f1915fd3c39..dd730909daa 100644 --- a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml +++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml @@ -28,6 +28,4 @@ - - diff --git a/tests/auto/testlib/selftests/expected_warnings.junitxml b/tests/auto/testlib/selftests/expected_warnings.junitxml index 28ef1308397..69000160b35 100644 --- a/tests/auto/testlib/selftests/expected_warnings.junitxml +++ b/tests/auto/testlib/selftests/expected_warnings.junitxml @@ -17,46 +17,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/auto/testlib/selftests/expected_watchdog.junitxml b/tests/auto/testlib/selftests/expected_watchdog.junitxml index f9b7e6fd9ae..5aae1275874 100644 --- a/tests/auto/testlib/selftests/expected_watchdog.junitxml +++ b/tests/auto/testlib/selftests/expected_watchdog.junitxml @@ -9,6 +9,4 @@ - -