testlib: Report one test result per benchmark test.

Prior to this commit, a benchmark test could report 0..n passes and 0..m
fails or skips, where n is the number of accumulation iterations used to
collect benchmark data and m is the number of times the test function
was invoked.  Depending on the type of benchmark measurer being used,
this could result in a very large volume of test output and inconsistent
pass, fail and skip counts between test runs.

This commit changes the behaviour so that each benchmark test reports
one pass, fail or skip, regardless of the number of iterations used to
collect benchmark data.

This commit also prevents benchmark data being reported in the test
output if the benchmark test failed or skipped, as any benchmark data is
of dubious value in such cases.

The latter change in behaviour requires a minor modification to the
badxml selftest, which now tests quoting of literal strings in xml test
output for both passing and failing benchmarks.

Finally, this commit also adds a new selftest specifically for verifying
correct behaviour for benchmarks that fail or skip.

Task-number: QTBUG-24313
Change-Id: I3426dc659a7511b62fd183a031c7235bc753f497
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

1 files changed, 25 insertions, 17 deletions

diff --git a/tests/auto/testlib/selftests/expected_badxml.txt b/tests/auto/testlib/selftests/expected_badxml.txt
index d4f4432066..68d333ec30 100644
--- a/tests/auto/testlib/selftests/expected_badxml.txt
+++ b/tests/auto/testlib/selftests/expected_badxml.txt
@@ -1,25 +1,33 @@
 ********* Start testing of tst_BadXml *********
 Config: Using QTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@
 PASS   : tst_BadXml::initTestCase()
-QDEBUG : tst_BadXml::badDataTag(end cdata ]]> text ]]> more text) a message
-FAIL!  : tst_BadXml::badDataTag(end cdata ]]> text ]]> more text) a failure
-   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(109)]
-RESULT : tst_BadXml::badDataTag():"end cdata ]]> text ]]> more text":
+QDEBUG : tst_BadXml::badDataTag(fail end cdata ]]> text ]]> more text) a message
+FAIL!  : tst_BadXml::badDataTag(fail end cdata ]]> text ]]> more text) a failure
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(111)]
+QDEBUG : tst_BadXml::badDataTag(pass end cdata ]]> text ]]> more text) a message
+PASS   : tst_BadXml::badDataTag(pass end cdata ]]> text ]]> more text)
+RESULT : tst_BadXml::badDataTag():"pass end cdata ]]> text ]]> more text":
      0 events per iteration (total: 0, iterations: 1)
-QDEBUG : tst_BadXml::badDataTag(quotes " text" more text) a message
-FAIL!  : tst_BadXml::badDataTag(quotes " text" more text) a failure
-   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(109)]
-RESULT : tst_BadXml::badDataTag():"quotes " text" more text":
+QDEBUG : tst_BadXml::badDataTag(fail quotes " text" more text) a message
+FAIL!  : tst_BadXml::badDataTag(fail quotes " text" more text) a failure
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(111)]
+QDEBUG : tst_BadXml::badDataTag(pass quotes " text" more text) a message
+PASS   : tst_BadXml::badDataTag(pass quotes " text" more text)
+RESULT : tst_BadXml::badDataTag():"pass quotes " text" more text":
      0 events per iteration (total: 0, iterations: 1)
-QDEBUG : tst_BadXml::badDataTag(xml close > open < tags < text) a message
-FAIL!  : tst_BadXml::badDataTag(xml close > open < tags < text) a failure
-   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(109)]
-RESULT : tst_BadXml::badDataTag():"xml close > open < tags < text":
+QDEBUG : tst_BadXml::badDataTag(fail xml close > open < tags < text) a message
+FAIL!  : tst_BadXml::badDataTag(fail xml close > open < tags < text) a failure
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(111)]
+QDEBUG : tst_BadXml::badDataTag(pass xml close > open < tags < text) a message
+PASS   : tst_BadXml::badDataTag(pass xml close > open < tags < text)
+RESULT : tst_BadXml::badDataTag():"pass xml close > open < tags < text":
      0 events per iteration (total: 0, iterations: 1)
-QDEBUG : tst_BadXml::badDataTag(all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) a message
-FAIL!  : tst_BadXml::badDataTag(all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) a failure
-   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(109)]
-RESULT : tst_BadXml::badDataTag():"all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs":
+QDEBUG : tst_BadXml::badDataTag(fail all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) a message
+FAIL!  : tst_BadXml::badDataTag(fail all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) a failure
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(111)]
+QDEBUG : tst_BadXml::badDataTag(pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) a message
+PASS   : tst_BadXml::badDataTag(pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs)
+RESULT : tst_BadXml::badDataTag():"pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs":
      0 events per iteration (total: 0, iterations: 1)
 QDEBUG : tst_BadXml::badMessage(string 0) end cdata ]]> text ]]> more text
 PASS   : tst_BadXml::badMessage(string 0)
@@ -31,5 +39,5 @@ QDEBUG : tst_BadXml::badMessage(string 3) all > " mixed ]]> up > " in < the ]]>
 PASS   : tst_BadXml::badMessage(string 3)
 FAIL!  : tst_BadXml::failWithNoFile() failure message
 PASS   : tst_BadXml::cleanupTestCase()
-Totals: 6 passed, 5 failed, 0 skipped
+Totals: 10 passed, 5 failed, 0 skipped
 ********* Finished testing of tst_BadXml *********