Match up testlib selftest's lists of generated files

The actual files present for expected data, the test function that
selected which tests to skip and the python function to select which
to not generate data for weren't in sync with one another.

The test-code's reason for omitting three tests was that we lacked
data files for them. So generate those and skip that exception. The
generator script's code to decide which to generate didn't exclude
anything like as many, so update it to match the test-code. In the
process, save repeating a startswith test that was used both
positively and negatively, unifying two conditions.

Extend the generator script's handling of its --skip-callgrind option
by auto-setting that option if valgrind isn't available, to match the
driver program's similar skipping.

The generated data included many files for tests we skip and, as
mentioned already, lacked files for some tests we only skipped because
we lacked them. Remove the unused files, add the lacking ones.

Change-Id: If91696cdd95b7b0d5f3d686bff839f1bf15e121b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

52 files changed, 421 insertions, 1229 deletions

diff --git a/tests/auto/testlib/selftests/expected_badxml.tap b/tests/auto/testlib/selftests/expected_badxml.tap
deleted file mode 100644
index 81e4fe5312..0000000000
--- a/tests/auto/testlib/selftests/expected_badxml.tap
+++ /dev/null
@@ -1,61 +0,0 @@
-TAP version 13
-# tst_BadXml
-ok 1 - initTestCase()
-# a message
-not ok 2 - badDataTag(fail end cdata ]]> text ]]> more text)
-  ---
-  # a failure
-  at: tst_BadXml::badDataTag() (qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp:0)
-  file: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp
-  line: 0
-  ...
-# a message
-ok 3 - badDataTag(pass end cdata ]]> text ]]> more text)
-# a message
-not ok 4 - badDataTag(fail quotes " text" more text)
-  ---
-  # a failure
-  at: tst_BadXml::badDataTag() (qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp:0)
-  file: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp
-  line: 0
-  ...
-# a message
-ok 5 - badDataTag(pass quotes " text" more text)
-# a message
-not ok 6 - badDataTag(fail xml close > open < tags < text)
-  ---
-  # a failure
-  at: tst_BadXml::badDataTag() (qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp:0)
-  file: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp
-  line: 0
-  ...
-# a message
-ok 7 - badDataTag(pass xml close > open < tags < text)
-# a message
-not ok 8 - badDataTag(fail all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs)
-  ---
-  # a failure
-  at: tst_BadXml::badDataTag() (qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp:0)
-  file: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp
-  line: 0
-  ...
-# a message
-ok 9 - badDataTag(pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs)
-# end cdata ]]> text ]]> more text
-ok 10 - badMessage(string 0)
-# quotes " text" more text
-ok 11 - badMessage(string 1)
-# xml close > open < tags < text
-ok 12 - badMessage(string 2)
-# all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs
-ok 13 - badMessage(string 3)
-not ok 14 - failWithNoFile()
-  ---
-  # failure message
-  ...
-ok 15 - encoding() # SKIP Skipped for text due to unpredictable console encoding.
-ok 16 - cleanupTestCase()
-1..16
-# tests 16
-# pass 10
-# fail 5
diff --git a/tests/auto/testlib/selftests/expected_badxml.teamcity b/tests/auto/testlib/selftests/expected_badxml.teamcity
deleted file mode 100644
index e765393375..0000000000
--- a/tests/auto/testlib/selftests/expected_badxml.teamcity
+++ /dev/null
@@ -1,50 +0,0 @@
-##teamcity[testSuiteStarted name='tst_BadXml' flowId='tst_BadXml']
-##teamcity[testStarted name='initTestCase()' flowId='tst_BadXml']
-##teamcity[testFinished name='initTestCase()' flowId='tst_BadXml']
-##teamcity[testStarted name='badDataTag(fail end cdata |]|]> text |]|]> more text)' flowId='tst_BadXml']
-##teamcity[testFailed name='badDataTag(fail end cdata |]|]> text |]|]> more text)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(0)|]' details='a failure' flowId='tst_BadXml']
-##teamcity[testStdOut name='badDataTag(fail end cdata |]|]> text |]|]> more text)' out='QDEBUG: a message' flowId='tst_BadXml']
-##teamcity[testFinished name='badDataTag(fail end cdata |]|]> text |]|]> more text)' flowId='tst_BadXml']
-##teamcity[testStarted name='badDataTag(pass end cdata |]|]> text |]|]> more text)' flowId='tst_BadXml']
-##teamcity[testStdOut name='badDataTag(pass end cdata |]|]> text |]|]> more text)' out='QDEBUG: a message' flowId='tst_BadXml']
-##teamcity[testFinished name='badDataTag(pass end cdata |]|]> text |]|]> more text)' flowId='tst_BadXml']
-##teamcity[testStarted name='badDataTag(fail quotes " text" more text)' flowId='tst_BadXml']
-##teamcity[testFailed name='badDataTag(fail quotes " text" more text)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(0)|]' details='a failure' flowId='tst_BadXml']
-##teamcity[testStdOut name='badDataTag(fail quotes " text" more text)' out='QDEBUG: a message' flowId='tst_BadXml']
-##teamcity[testFinished name='badDataTag(fail quotes " text" more text)' flowId='tst_BadXml']
-##teamcity[testStarted name='badDataTag(pass quotes " text" more text)' flowId='tst_BadXml']
-##teamcity[testStdOut name='badDataTag(pass quotes " text" more text)' out='QDEBUG: a message' flowId='tst_BadXml']
-##teamcity[testFinished name='badDataTag(pass quotes " text" more text)' flowId='tst_BadXml']
-##teamcity[testStarted name='badDataTag(fail xml close > open < tags < text)' flowId='tst_BadXml']
-##teamcity[testFailed name='badDataTag(fail xml close > open < tags < text)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(0)|]' details='a failure' flowId='tst_BadXml']
-##teamcity[testStdOut name='badDataTag(fail xml close > open < tags < text)' out='QDEBUG: a message' flowId='tst_BadXml']
-##teamcity[testFinished name='badDataTag(fail xml close > open < tags < text)' flowId='tst_BadXml']
-##teamcity[testStarted name='badDataTag(pass xml close > open < tags < text)' flowId='tst_BadXml']
-##teamcity[testStdOut name='badDataTag(pass xml close > open < tags < text)' out='QDEBUG: a message' flowId='tst_BadXml']
-##teamcity[testFinished name='badDataTag(pass xml close > open < tags < text)' flowId='tst_BadXml']
-##teamcity[testStarted name='badDataTag(fail all > " mixed |]|]> up > " in < the |]|]> hopes < of triggering "< |]|]> bugs)' flowId='tst_BadXml']
-##teamcity[testFailed name='badDataTag(fail all > " mixed |]|]> up > " in < the |]|]> hopes < of triggering "< |]|]> bugs)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(0)|]' details='a failure' flowId='tst_BadXml']
-##teamcity[testStdOut name='badDataTag(fail all > " mixed |]|]> up > " in < the |]|]> hopes < of triggering "< |]|]> bugs)' out='QDEBUG: a message' flowId='tst_BadXml']
-##teamcity[testFinished name='badDataTag(fail all > " mixed |]|]> up > " in < the |]|]> hopes < of triggering "< |]|]> bugs)' flowId='tst_BadXml']
-##teamcity[testStarted name='badDataTag(pass all > " mixed |]|]> up > " in < the |]|]> hopes < of triggering "< |]|]> bugs)' flowId='tst_BadXml']
-##teamcity[testStdOut name='badDataTag(pass all > " mixed |]|]> up > " in < the |]|]> hopes < of triggering "< |]|]> bugs)' out='QDEBUG: a message' flowId='tst_BadXml']
-##teamcity[testFinished name='badDataTag(pass all > " mixed |]|]> up > " in < the |]|]> hopes < of triggering "< |]|]> bugs)' flowId='tst_BadXml']
-##teamcity[testStarted name='badMessage(string 0)' flowId='tst_BadXml']
-##teamcity[testStdOut name='badMessage(string 0)' out='QDEBUG: end cdata |]|]> text |]|]> more text' flowId='tst_BadXml']
-##teamcity[testFinished name='badMessage(string 0)' flowId='tst_BadXml']
-##teamcity[testStarted name='badMessage(string 1)' flowId='tst_BadXml']
-##teamcity[testStdOut name='badMessage(string 1)' out='QDEBUG: quotes " text" more text' flowId='tst_BadXml']
-##teamcity[testFinished name='badMessage(string 1)' flowId='tst_BadXml']
-##teamcity[testStarted name='badMessage(string 2)' flowId='tst_BadXml']
-##teamcity[testStdOut name='badMessage(string 2)' out='QDEBUG: xml close > open < tags < text' flowId='tst_BadXml']
-##teamcity[testFinished name='badMessage(string 2)' flowId='tst_BadXml']
-##teamcity[testStarted name='badMessage(string 3)' flowId='tst_BadXml']
-##teamcity[testStdOut name='badMessage(string 3)' out='QDEBUG: all > " mixed |]|]> up > " in < the |]|]> hopes < of triggering "< |]|]> bugs' flowId='tst_BadXml']
-##teamcity[testFinished name='badMessage(string 3)' flowId='tst_BadXml']
-##teamcity[testStarted name='failWithNoFile()' flowId='tst_BadXml']
-##teamcity[testFailed name='failWithNoFile()' message='Failure!' details='failure message' flowId='tst_BadXml']
-##teamcity[testFinished name='failWithNoFile()' flowId='tst_BadXml']
-##teamcity[testIgnored name='encoding()' message='Skipped for text due to unpredictable console encoding. |[Loc: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(0)|]' flowId='tst_BadXml']
-##teamcity[testStarted name='cleanupTestCase()' flowId='tst_BadXml']
-##teamcity[testFinished name='cleanupTestCase()' flowId='tst_BadXml']
-##teamcity[testSuiteFinished name='tst_BadXml' flowId='tst_BadXml']
diff --git a/tests/auto/testlib/selftests/expected_badxml.txt b/tests/auto/testlib/selftests/expected_badxml.txt
deleted file mode 100644
index e9d8695130..0000000000
--- a/tests/auto/testlib/selftests/expected_badxml.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-********* Start testing of tst_BadXml *********
-Config: Using QtTest library
-PASS   : tst_BadXml::initTestCase()
-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: [qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(0)]
-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(fail quotes " text" more text) a message
-FAIL!  : tst_BadXml::badDataTag(fail quotes " text" more text) a failure
-   Loc: [qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(0)]
-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(fail xml close > open < tags < text) a message
-FAIL!  : tst_BadXml::badDataTag(fail xml close > open < tags < text) a failure
-   Loc: [qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(0)]
-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(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: [qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(0)]
-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)
-QDEBUG : tst_BadXml::badMessage(string 1) quotes " text" more text
-PASS   : tst_BadXml::badMessage(string 1)
-QDEBUG : tst_BadXml::badMessage(string 2) xml close > open < tags < text
-PASS   : tst_BadXml::badMessage(string 2)
-QDEBUG : tst_BadXml::badMessage(string 3) all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs
-PASS   : tst_BadXml::badMessage(string 3)
-FAIL!  : tst_BadXml::failWithNoFile() failure message
-SKIP   : tst_BadXml::encoding() Skipped for text due to unpredictable console encoding.
-   Loc: [qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(0)]
-PASS   : tst_BadXml::cleanupTestCase()
-Totals: 10 passed, 5 failed, 1 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_BadXml *********
diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.teamcity b/tests/auto/testlib/selftests/expected_benchlibcounting.teamcity
deleted file mode 100644
index f693db31d8..0000000000
--- a/tests/auto/testlib/selftests/expected_benchlibcounting.teamcity
+++ /dev/null
@@ -1,12 +0,0 @@
-##teamcity[testSuiteStarted name='tst_BenchlibCounting' flowId='tst_BenchlibCounting']
-##teamcity[testStarted name='initTestCase()' flowId='tst_BenchlibCounting']
-##teamcity[testFinished name='initTestCase()' flowId='tst_BenchlibCounting']
-##teamcity[testStarted name='passingBenchmark()' flowId='tst_BenchlibCounting']
-##teamcity[testFinished name='passingBenchmark()' flowId='tst_BenchlibCounting']
-##teamcity[testIgnored name='skippingBenchmark()' message='This is a skipping benchmark |[Loc: qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp(0)|]' flowId='tst_BenchlibCounting']
-##teamcity[testStarted name='failingBenchmark()' flowId='tst_BenchlibCounting']
-##teamcity[testFailed name='failingBenchmark()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp(0)|]' details='This is a failing benchmark' flowId='tst_BenchlibCounting']
-##teamcity[testFinished name='failingBenchmark()' flowId='tst_BenchlibCounting']
-##teamcity[testStarted name='cleanupTestCase()' flowId='tst_BenchlibCounting']
-##teamcity[testFinished name='cleanupTestCase()' flowId='tst_BenchlibCounting']
-##teamcity[testSuiteFinished name='tst_BenchlibCounting' flowId='tst_BenchlibCounting']
diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.teamcity b/tests/auto/testlib/selftests/expected_benchlibeventcounter.teamcity
deleted file mode 100644
index 6cb4c7214c..0000000000
--- a/tests/auto/testlib/selftests/expected_benchlibeventcounter.teamcity
+++ /dev/null
@@ -1,20 +0,0 @@
-##teamcity[testSuiteStarted name='tst_BenchlibEventCounter' flowId='tst_BenchlibEventCounter']
-##teamcity[testStarted name='initTestCase()' flowId='tst_BenchlibEventCounter']
-##teamcity[testFinished name='initTestCase()' flowId='tst_BenchlibEventCounter']
-##teamcity[testStarted name='events(0)' flowId='tst_BenchlibEventCounter']
-##teamcity[testFinished name='events(0)' flowId='tst_BenchlibEventCounter']
-##teamcity[testStarted name='events(1)' flowId='tst_BenchlibEventCounter']
-##teamcity[testFinished name='events(1)' flowId='tst_BenchlibEventCounter']
-##teamcity[testStarted name='events(10)' flowId='tst_BenchlibEventCounter']
-##teamcity[testFinished name='events(10)' flowId='tst_BenchlibEventCounter']
-##teamcity[testStarted name='events(100)' flowId='tst_BenchlibEventCounter']
-##teamcity[testFinished name='events(100)' flowId='tst_BenchlibEventCounter']
-##teamcity[testStarted name='events(500)' flowId='tst_BenchlibEventCounter']
-##teamcity[testFinished name='events(500)' flowId='tst_BenchlibEventCounter']
-##teamcity[testStarted name='events(5000)' flowId='tst_BenchlibEventCounter']
-##teamcity[testFinished name='events(5000)' flowId='tst_BenchlibEventCounter']
-##teamcity[testStarted name='events(100000)' flowId='tst_BenchlibEventCounter']
-##teamcity[testFinished name='events(100000)' flowId='tst_BenchlibEventCounter']
-##teamcity[testStarted name='cleanupTestCase()' flowId='tst_BenchlibEventCounter']
-##teamcity[testFinished name='cleanupTestCase()' flowId='tst_BenchlibEventCounter']
-##teamcity[testSuiteFinished name='tst_BenchlibEventCounter' flowId='tst_BenchlibEventCounter']
diff --git a/tests/auto/testlib/selftests/expected_benchliboptions.csv b/tests/auto/testlib/selftests/expected_benchliboptions.csv
deleted file mode 100644
index 9b899aed90..0000000000
--- a/tests/auto/testlib/selftests/expected_benchliboptions.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"threeEvents","","Events",3,3,1
-"threeEvents","","Events",3,45,15
-"threeEvents","","Events",3,3,1
diff --git a/tests/auto/testlib/selftests/expected_benchliboptions.junitxml b/tests/auto/testlib/selftests/expected_benchliboptions.junitxml
deleted file mode 100644
index 4c1b28d707..0000000000
--- a/tests/auto/testlib/selftests/expected_benchliboptions.junitxml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_BenchlibOptions" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="0" time="@TEST_DURATION@">
-  <properties>
-    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtBuild" value=""/>
-  </properties>
-  <testcase name="initTestCase" classname="tst_BenchlibOptions" time="@TEST_DURATION@"/>
-  <testcase name="threeEvents" classname="tst_BenchlibOptions" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" classname="tst_BenchlibOptions" time="@TEST_DURATION@"/>
-</testsuite>
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_BenchlibFifteenIterations" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="0" time="@TEST_DURATION@">
-  <properties>
-    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtBuild" value=""/>
-  </properties>
-  <testcase name="initTestCase" classname="tst_BenchlibFifteenIterations" time="@TEST_DURATION@"/>
-  <testcase name="threeEvents" classname="tst_BenchlibFifteenIterations" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" classname="tst_BenchlibFifteenIterations" time="@TEST_DURATION@"/>
-</testsuite>
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_BenchlibOneHundredMinimum" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="0" time="@TEST_DURATION@">
-  <properties>
-    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtBuild" value=""/>
-  </properties>
-  <testcase name="initTestCase" classname="tst_BenchlibOneHundredMinimum" time="@TEST_DURATION@"/>
-  <testcase name="threeEvents" classname="tst_BenchlibOneHundredMinimum" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" classname="tst_BenchlibOneHundredMinimum" time="@TEST_DURATION@"/>
-</testsuite>
diff --git a/tests/auto/testlib/selftests/expected_benchliboptions.lightxml b/tests/auto/testlib/selftests/expected_benchliboptions.lightxml
deleted file mode 100644
index ed7c206a61..0000000000
--- a/tests/auto/testlib/selftests/expected_benchliboptions.lightxml
+++ /dev/null
@@ -1,57 +0,0 @@
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QtBuild/>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-</Environment>
-<TestFunction name="initTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="threeEvents">
-<Incident type="pass" file="" line="0" />
-<BenchmarkResult metric="Events" tag="" value="3" iterations="1" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="cleanupTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<Duration msecs="0"/>
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QtBuild/>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-</Environment>
-<TestFunction name="initTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="threeEvents">
-<Incident type="pass" file="" line="0" />
-<BenchmarkResult metric="Events" tag="" value="3" iterations="15" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="cleanupTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<Duration msecs="0"/>
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QtBuild/>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-</Environment>
-<TestFunction name="initTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="threeEvents">
-<Incident type="pass" file="" line="0" />
-<BenchmarkResult metric="Events" tag="" value="3" iterations="64" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="cleanupTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_benchliboptions.tap b/tests/auto/testlib/selftests/expected_benchliboptions.tap
deleted file mode 100644
index 6a006ea881..0000000000
--- a/tests/auto/testlib/selftests/expected_benchliboptions.tap
+++ /dev/null
@@ -1,27 +0,0 @@
-TAP version 13
-# tst_BenchlibOptions
-ok 1 - initTestCase()
-ok 2 - threeEvents()
-ok 3 - cleanupTestCase()
-1..3
-# tests 3
-# pass 3
-# fail 0
-TAP version 13
-# tst_BenchlibFifteenIterations
-ok 1 - initTestCase()
-ok 2 - threeEvents()
-ok 3 - cleanupTestCase()
-1..3
-# tests 3
-# pass 3
-# fail 0
-TAP version 13
-# tst_BenchlibOneHundredMinimum
-ok 1 - initTestCase()
-ok 2 - threeEvents()
-ok 3 - cleanupTestCase()
-1..3
-# tests 3
-# pass 3
-# fail 0
diff --git a/tests/auto/testlib/selftests/expected_benchliboptions.teamcity b/tests/auto/testlib/selftests/expected_benchliboptions.teamcity
deleted file mode 100644
index 6dbaa64af7..0000000000
--- a/tests/auto/testlib/selftests/expected_benchliboptions.teamcity
+++ /dev/null
@@ -1,24 +0,0 @@
-##teamcity[testSuiteStarted name='tst_BenchlibOptions' flowId='tst_BenchlibOptions']
-##teamcity[testStarted name='initTestCase()' flowId='tst_BenchlibOptions']
-##teamcity[testFinished name='initTestCase()' flowId='tst_BenchlibOptions']
-##teamcity[testStarted name='threeEvents()' flowId='tst_BenchlibOptions']
-##teamcity[testFinished name='threeEvents()' flowId='tst_BenchlibOptions']
-##teamcity[testStarted name='cleanupTestCase()' flowId='tst_BenchlibOptions']
-##teamcity[testFinished name='cleanupTestCase()' flowId='tst_BenchlibOptions']
-##teamcity[testSuiteFinished name='tst_BenchlibOptions' flowId='tst_BenchlibOptions']
-##teamcity[testSuiteStarted name='tst_BenchlibFifteenIterations' flowId='tst_BenchlibFifteenIterations']
-##teamcity[testStarted name='initTestCase()' flowId='tst_BenchlibFifteenIterations']
-##teamcity[testFinished name='initTestCase()' flowId='tst_BenchlibFifteenIterations']
-##teamcity[testStarted name='threeEvents()' flowId='tst_BenchlibFifteenIterations']
-##teamcity[testFinished name='threeEvents()' flowId='tst_BenchlibFifteenIterations']
-##teamcity[testStarted name='cleanupTestCase()' flowId='tst_BenchlibFifteenIterations']
-##teamcity[testFinished name='cleanupTestCase()' flowId='tst_BenchlibFifteenIterations']
-##teamcity[testSuiteFinished name='tst_BenchlibFifteenIterations' flowId='tst_BenchlibFifteenIterations']
-##teamcity[testSuiteStarted name='tst_BenchlibOneHundredMinimum' flowId='tst_BenchlibOneHundredMinimum']
-##teamcity[testStarted name='initTestCase()' flowId='tst_BenchlibOneHundredMinimum']
-##teamcity[testFinished name='initTestCase()' flowId='tst_BenchlibOneHundredMinimum']
-##teamcity[testStarted name='threeEvents()' flowId='tst_BenchlibOneHundredMinimum']
-##teamcity[testFinished name='threeEvents()' flowId='tst_BenchlibOneHundredMinimum']
-##teamcity[testStarted name='cleanupTestCase()' flowId='tst_BenchlibOneHundredMinimum']
-##teamcity[testFinished name='cleanupTestCase()' flowId='tst_BenchlibOneHundredMinimum']
-##teamcity[testSuiteFinished name='tst_BenchlibOneHundredMinimum' flowId='tst_BenchlibOneHundredMinimum']
diff --git a/tests/auto/testlib/selftests/expected_benchliboptions.xml b/tests/auto/testlib/selftests/expected_benchliboptions.xml
deleted file mode 100644
index 45ae180889..0000000000
--- a/tests/auto/testlib/selftests/expected_benchliboptions.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestCase name="tst_BenchlibOptions">
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QtBuild/>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-</Environment>
-<TestFunction name="initTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="threeEvents">
-<Incident type="pass" file="" line="0" />
-<BenchmarkResult metric="Events" tag="" value="3" iterations="1" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="cleanupTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<Duration msecs="0"/>
-</TestCase>
-<?xml version="1.0" encoding="UTF-8"?>
-<TestCase name="tst_BenchlibFifteenIterations">
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QtBuild/>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-</Environment>
-<TestFunction name="initTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="threeEvents">
-<Incident type="pass" file="" line="0" />
-<BenchmarkResult metric="Events" tag="" value="3" iterations="15" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="cleanupTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<Duration msecs="0"/>
-</TestCase>
-<?xml version="1.0" encoding="UTF-8"?>
-<TestCase name="tst_BenchlibOneHundredMinimum">
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QtBuild/>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-</Environment>
-<TestFunction name="initTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="threeEvents">
-<Incident type="pass" file="" line="0" />
-<BenchmarkResult metric="Events" tag="" value="3" iterations="64" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="cleanupTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<Duration msecs="0"/>
-</TestCase>
diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.csv b/tests/auto/testlib/selftests/expected_benchlibtickcounter.csv
index fe5af1e7c8..bac416482e 100644
--- a/tests/auto/testlib/selftests/expected_benchlibtickcounter.csv
+++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.csv
@@ -1 +1 @@
-"threeBillionTicks","","CPUTicks",3000000000,3000000000,1
+"threeBillionTicks","","CPUTicks",3000071247,3000071247,1
diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.teamcity b/tests/auto/testlib/selftests/expected_benchlibtickcounter.teamcity
deleted file mode 100644
index 842d36b79c..0000000000
--- a/tests/auto/testlib/selftests/expected_benchlibtickcounter.teamcity
+++ /dev/null
@@ -1,8 +0,0 @@
-##teamcity[testSuiteStarted name='tst_BenchlibTickCounter' flowId='tst_BenchlibTickCounter']
-##teamcity[testStarted name='initTestCase()' flowId='tst_BenchlibTickCounter']
-##teamcity[testFinished name='initTestCase()' flowId='tst_BenchlibTickCounter']
-##teamcity[testStarted name='threeBillionTicks()' flowId='tst_BenchlibTickCounter']
-##teamcity[testFinished name='threeBillionTicks()' flowId='tst_BenchlibTickCounter']
-##teamcity[testStarted name='cleanupTestCase()' flowId='tst_BenchlibTickCounter']
-##teamcity[testFinished name='cleanupTestCase()' flowId='tst_BenchlibTickCounter']
-##teamcity[testSuiteFinished name='tst_BenchlibTickCounter' flowId='tst_BenchlibTickCounter']
diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.teamcity b/tests/auto/testlib/selftests/expected_benchlibwalltime.teamcity
deleted file mode 100644
index 4c5d9667e7..0000000000
--- a/tests/auto/testlib/selftests/expected_benchlibwalltime.teamcity
+++ /dev/null
@@ -1,12 +0,0 @@
-##teamcity[testSuiteStarted name='tst_BenchlibWalltime' flowId='tst_BenchlibWalltime']
-##teamcity[testStarted name='initTestCase()' flowId='tst_BenchlibWalltime']
-##teamcity[testFinished name='initTestCase()' flowId='tst_BenchlibWalltime']
-##teamcity[testStarted name='waitForOneThousand()' flowId='tst_BenchlibWalltime']
-##teamcity[testFinished name='waitForOneThousand()' flowId='tst_BenchlibWalltime']
-##teamcity[testStarted name='waitForFourThousand()' flowId='tst_BenchlibWalltime']
-##teamcity[testFinished name='waitForFourThousand()' flowId='tst_BenchlibWalltime']
-##teamcity[testStarted name='qbenchmark_once()' flowId='tst_BenchlibWalltime']
-##teamcity[testFinished name='qbenchmark_once()' flowId='tst_BenchlibWalltime']
-##teamcity[testStarted name='cleanupTestCase()' flowId='tst_BenchlibWalltime']
-##teamcity[testFinished name='cleanupTestCase()' flowId='tst_BenchlibWalltime']
-##teamcity[testSuiteFinished name='tst_BenchlibWalltime' flowId='tst_BenchlibWalltime']
diff --git a/tests/auto/testlib/selftests/expected_deleteLater.junitxml b/tests/auto/testlib/selftests/expected_deleteLater.junitxml
new file mode 100644
index 0000000000..1dc9cb6346
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_deleteLater.junitxml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite name="tst_DeleteLater" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="5" failures="0" errors="0" skipped="0" time="@TEST_DURATION@">
+  <properties>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
+  </properties>
+  <testcase name="initTestCase" classname="tst_DeleteLater" time="@TEST_DURATION@"/>
+  <testcase name="qtestLibShouldFlushDeleteLaterBetweenTests_setup" classname="tst_DeleteLater" time="@TEST_DURATION@"/>
+  <testcase name="qtestLibShouldFlushDeleteLaterBetweenTests_check" classname="tst_DeleteLater" time="@TEST_DURATION@"/>
+  <testcase name="qtestLibShouldFlushDeleteLaterOnExit" classname="tst_DeleteLater" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_DeleteLater" time="@TEST_DURATION@"/>
+</testsuite>
diff --git a/tests/auto/testlib/selftests/expected_sleep.lightxml b/tests/auto/testlib/selftests/expected_deleteLater.lightxml
index 78e1c44cf2..f80dd979a3 100644
--- a/tests/auto/testlib/selftests/expected_sleep.lightxml
+++ b/tests/auto/testlib/selftests/expected_deleteLater.lightxml
@@ -7,11 +7,15 @@
 <Incident type="pass" file="" line="0" />
     <Duration msecs="0"/>
 </TestFunction>
-<TestFunction name="sleep">
+<TestFunction name="qtestLibShouldFlushDeleteLaterBetweenTests_setup">
 <Incident type="pass" file="" line="0" />
     <Duration msecs="0"/>
 </TestFunction>
-<TestFunction name="wait">
+<TestFunction name="qtestLibShouldFlushDeleteLaterBetweenTests_check">
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="qtestLibShouldFlushDeleteLaterOnExit">
 <Incident type="pass" file="" line="0" />
     <Duration msecs="0"/>
 </TestFunction>
diff --git a/tests/auto/testlib/selftests/expected_deleteLater.tap b/tests/auto/testlib/selftests/expected_deleteLater.tap
new file mode 100644
index 0000000000..01f659cee2
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_deleteLater.tap
@@ -0,0 +1,11 @@
+TAP version 13
+# tst_DeleteLater
+ok 1 - initTestCase()
+ok 2 - qtestLibShouldFlushDeleteLaterBetweenTests_setup()
+ok 3 - qtestLibShouldFlushDeleteLaterBetweenTests_check()
+ok 4 - qtestLibShouldFlushDeleteLaterOnExit()
+ok 5 - cleanupTestCase()
+1..5
+# tests 5
+# pass 5
+# fail 0
diff --git a/tests/auto/testlib/selftests/expected_deleteLater.teamcity b/tests/auto/testlib/selftests/expected_deleteLater.teamcity
new file mode 100644
index 0000000000..7208e04571
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_deleteLater.teamcity
@@ -0,0 +1,12 @@
+##teamcity[testSuiteStarted name='tst_DeleteLater' flowId='tst_DeleteLater']
+##teamcity[testStarted name='initTestCase()' flowId='tst_DeleteLater']
+##teamcity[testFinished name='initTestCase()' flowId='tst_DeleteLater']
+##teamcity[testStarted name='qtestLibShouldFlushDeleteLaterBetweenTests_setup()' flowId='tst_DeleteLater']
+##teamcity[testFinished name='qtestLibShouldFlushDeleteLaterBetweenTests_setup()' flowId='tst_DeleteLater']
+##teamcity[testStarted name='qtestLibShouldFlushDeleteLaterBetweenTests_check()' flowId='tst_DeleteLater']
+##teamcity[testFinished name='qtestLibShouldFlushDeleteLaterBetweenTests_check()' flowId='tst_DeleteLater']
+##teamcity[testStarted name='qtestLibShouldFlushDeleteLaterOnExit()' flowId='tst_DeleteLater']
+##teamcity[testFinished name='qtestLibShouldFlushDeleteLaterOnExit()' flowId='tst_DeleteLater']
+##teamcity[testStarted name='cleanupTestCase()' flowId='tst_DeleteLater']
+##teamcity[testFinished name='cleanupTestCase()' flowId='tst_DeleteLater']
+##teamcity[testSuiteFinished name='tst_DeleteLater' flowId='tst_DeleteLater']
diff --git a/tests/auto/testlib/selftests/expected_deleteLater.txt b/tests/auto/testlib/selftests/expected_deleteLater.txt
new file mode 100644
index 0000000000..a4641c4842
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_deleteLater.txt
@@ -0,0 +1,9 @@
+********* Start testing of tst_DeleteLater *********
+Config: Using QtTest library
+PASS   : tst_DeleteLater::initTestCase()
+PASS   : tst_DeleteLater::qtestLibShouldFlushDeleteLaterBetweenTests_setup()
+PASS   : tst_DeleteLater::qtestLibShouldFlushDeleteLaterBetweenTests_check()
+PASS   : tst_DeleteLater::qtestLibShouldFlushDeleteLaterOnExit()
+PASS   : tst_DeleteLater::cleanupTestCase()
+Totals: 5 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
+********* Finished testing of tst_DeleteLater *********
diff --git a/tests/auto/testlib/selftests/expected_sleep.xml b/tests/auto/testlib/selftests/expected_deleteLater.xml
index 94bb25ba8d..5f56201ca9 100644
--- a/tests/auto/testlib/selftests/expected_sleep.xml
+++ b/tests/auto/testlib/selftests/expected_deleteLater.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<TestCase name="tst_Sleep">
+<TestCase name="tst_DeleteLater">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
     <QtBuild/>
@@ -9,11 +9,15 @@
 <Incident type="pass" file="" line="0" />
     <Duration msecs="0"/>
 </TestFunction>
-<TestFunction name="sleep">
+<TestFunction name="qtestLibShouldFlushDeleteLaterBetweenTests_setup">
 <Incident type="pass" file="" line="0" />
     <Duration msecs="0"/>
 </TestFunction>
-<TestFunction name="wait">
+<TestFunction name="qtestLibShouldFlushDeleteLaterBetweenTests_check">
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="qtestLibShouldFlushDeleteLaterOnExit">
 <Incident type="pass" file="" line="0" />
     <Duration msecs="0"/>
 </TestFunction>
diff --git a/tests/auto/testlib/selftests/expected_deleteLater_noApp.junitxml b/tests/auto/testlib/selftests/expected_deleteLater_noApp.junitxml
new file mode 100644
index 0000000000..ab40c8f5ad
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_deleteLater_noApp.junitxml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite name="tst_DeleteLater_noApp" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="5" failures="0" errors="0" skipped="0" time="@TEST_DURATION@">
+  <properties>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
+  </properties>
+  <testcase name="initTestCase" classname="tst_DeleteLater_noApp" time="@TEST_DURATION@"/>
+  <testcase name="qtestLibShouldNotFlushDeleteLaterBetweenTests_setup" classname="tst_DeleteLater_noApp" time="@TEST_DURATION@"/>
+  <testcase name="qtestLibShouldNotFlushDeleteLaterBetweenTests_check" classname="tst_DeleteLater_noApp" time="@TEST_DURATION@"/>
+  <testcase name="qtestLibShouldNotFlushDeleteLaterOnExit" classname="tst_DeleteLater_noApp" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_DeleteLater_noApp" time="@TEST_DURATION@"/>
+</testsuite>
diff --git a/tests/auto/testlib/selftests/expected_deleteLater_noApp.lightxml b/tests/auto/testlib/selftests/expected_deleteLater_noApp.lightxml
new file mode 100644
index 0000000000..00db566f8d
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_deleteLater_noApp.lightxml
@@ -0,0 +1,26 @@
+<Environment>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QtBuild/>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
+</Environment>
+<TestFunction name="initTestCase">
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="qtestLibShouldNotFlushDeleteLaterBetweenTests_setup">
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="qtestLibShouldNotFlushDeleteLaterBetweenTests_check">
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="qtestLibShouldNotFlushDeleteLaterOnExit">
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="cleanupTestCase">
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_deleteLater_noApp.tap b/tests/auto/testlib/selftests/expected_deleteLater_noApp.tap
new file mode 100644
index 0000000000..5924654b76
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_deleteLater_noApp.tap
@@ -0,0 +1,11 @@
+TAP version 13
+# tst_DeleteLater_noApp
+ok 1 - initTestCase()
+ok 2 - qtestLibShouldNotFlushDeleteLaterBetweenTests_setup()
+ok 3 - qtestLibShouldNotFlushDeleteLaterBetweenTests_check()
+ok 4 - qtestLibShouldNotFlushDeleteLaterOnExit()
+ok 5 - cleanupTestCase()
+1..5
+# tests 5
+# pass 5
+# fail 0
diff --git a/tests/auto/testlib/selftests/expected_deleteLater_noApp.teamcity b/tests/auto/testlib/selftests/expected_deleteLater_noApp.teamcity
new file mode 100644
index 0000000000..ac4545cc84
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_deleteLater_noApp.teamcity
@@ -0,0 +1,12 @@
+##teamcity[testSuiteStarted name='tst_DeleteLater_noApp' flowId='tst_DeleteLater_noApp']
+##teamcity[testStarted name='initTestCase()' flowId='tst_DeleteLater_noApp']
+##teamcity[testFinished name='initTestCase()' flowId='tst_DeleteLater_noApp']
+##teamcity[testStarted name='qtestLibShouldNotFlushDeleteLaterBetweenTests_setup()' flowId='tst_DeleteLater_noApp']
+##teamcity[testFinished name='qtestLibShouldNotFlushDeleteLaterBetweenTests_setup()' flowId='tst_DeleteLater_noApp']
+##teamcity[testStarted name='qtestLibShouldNotFlushDeleteLaterBetweenTests_check()' flowId='tst_DeleteLater_noApp']
+##teamcity[testFinished name='qtestLibShouldNotFlushDeleteLaterBetweenTests_check()' flowId='tst_DeleteLater_noApp']
+##teamcity[testStarted name='qtestLibShouldNotFlushDeleteLaterOnExit()' flowId='tst_DeleteLater_noApp']
+##teamcity[testFinished name='qtestLibShouldNotFlushDeleteLaterOnExit()' flowId='tst_DeleteLater_noApp']
+##teamcity[testStarted name='cleanupTestCase()' flowId='tst_DeleteLater_noApp']
+##teamcity[testFinished name='cleanupTestCase()' flowId='tst_DeleteLater_noApp']
+##teamcity[testSuiteFinished name='tst_DeleteLater_noApp' flowId='tst_DeleteLater_noApp']
diff --git a/tests/auto/testlib/selftests/expected_deleteLater_noApp.txt b/tests/auto/testlib/selftests/expected_deleteLater_noApp.txt
new file mode 100644
index 0000000000..14172bed9b
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_deleteLater_noApp.txt
@@ -0,0 +1,9 @@
+********* Start testing of tst_DeleteLater_noApp *********
+Config: Using QtTest library
+PASS   : tst_DeleteLater_noApp::initTestCase()
+PASS   : tst_DeleteLater_noApp::qtestLibShouldNotFlushDeleteLaterBetweenTests_setup()
+PASS   : tst_DeleteLater_noApp::qtestLibShouldNotFlushDeleteLaterBetweenTests_check()
+PASS   : tst_DeleteLater_noApp::qtestLibShouldNotFlushDeleteLaterOnExit()
+PASS   : tst_DeleteLater_noApp::cleanupTestCase()
+Totals: 5 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
+********* Finished testing of tst_DeleteLater_noApp *********
diff --git a/tests/auto/testlib/selftests/expected_deleteLater_noApp.xml b/tests/auto/testlib/selftests/expected_deleteLater_noApp.xml
new file mode 100644
index 0000000000..a871a6c380
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_deleteLater_noApp.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestCase name="tst_DeleteLater_noApp">
+<Environment>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QtBuild/>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
+</Environment>
+<TestFunction name="initTestCase">
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="qtestLibShouldNotFlushDeleteLaterBetweenTests_setup">
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="qtestLibShouldNotFlushDeleteLaterBetweenTests_check">
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="qtestLibShouldNotFlushDeleteLaterOnExit">
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="cleanupTestCase">
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<Duration msecs="0"/>
+</TestCase>
diff --git a/tests/auto/testlib/selftests/expected_differentexec.junitxml b/tests/auto/testlib/selftests/expected_differentexec.junitxml
deleted file mode 100644
index 30ee50bc08..0000000000
--- a/tests/auto/testlib/selftests/expected_differentexec.junitxml
+++ /dev/null
@@ -1,21 +0,0 @@
-********* Start testing of tst_TestA *********
-Config: Using QtTest library
-PASS   : tst_TestA::initTestCase()
-PASS   : tst_TestA::slotName()
-PASS   : tst_TestA::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_TestA *********
-********* Start testing of tst_TestA *********
-Config: Using QtTest library
-PASS   : tst_TestA::initTestCase()
-PASS   : tst_TestA::slotName()
-PASS   : tst_TestA::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_TestA *********
-********* Start testing of tst_TestB *********
-Config: Using QtTest library
-PASS   : tst_TestB::initTestCase()
-PASS   : tst_TestB::slotName()
-PASS   : tst_TestB::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_TestB *********
diff --git a/tests/auto/testlib/selftests/expected_differentexec.lightxml b/tests/auto/testlib/selftests/expected_differentexec.lightxml
deleted file mode 100644
index 30ee50bc08..0000000000
--- a/tests/auto/testlib/selftests/expected_differentexec.lightxml
+++ /dev/null
@@ -1,21 +0,0 @@
-********* Start testing of tst_TestA *********
-Config: Using QtTest library
-PASS   : tst_TestA::initTestCase()
-PASS   : tst_TestA::slotName()
-PASS   : tst_TestA::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_TestA *********
-********* Start testing of tst_TestA *********
-Config: Using QtTest library
-PASS   : tst_TestA::initTestCase()
-PASS   : tst_TestA::slotName()
-PASS   : tst_TestA::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_TestA *********
-********* Start testing of tst_TestB *********
-Config: Using QtTest library
-PASS   : tst_TestB::initTestCase()
-PASS   : tst_TestB::slotName()
-PASS   : tst_TestB::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_TestB *********
diff --git a/tests/auto/testlib/selftests/expected_differentexec.tap b/tests/auto/testlib/selftests/expected_differentexec.tap
deleted file mode 100644
index 30ee50bc08..0000000000
--- a/tests/auto/testlib/selftests/expected_differentexec.tap
+++ /dev/null
@@ -1,21 +0,0 @@
-********* Start testing of tst_TestA *********
-Config: Using QtTest library
-PASS   : tst_TestA::initTestCase()
-PASS   : tst_TestA::slotName()
-PASS   : tst_TestA::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_TestA *********
-********* Start testing of tst_TestA *********
-Config: Using QtTest library
-PASS   : tst_TestA::initTestCase()
-PASS   : tst_TestA::slotName()
-PASS   : tst_TestA::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_TestA *********
-********* Start testing of tst_TestB *********
-Config: Using QtTest library
-PASS   : tst_TestB::initTestCase()
-PASS   : tst_TestB::slotName()
-PASS   : tst_TestB::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_TestB *********
diff --git a/tests/auto/testlib/selftests/expected_differentexec.teamcity b/tests/auto/testlib/selftests/expected_differentexec.teamcity
deleted file mode 100644
index 30ee50bc08..0000000000
--- a/tests/auto/testlib/selftests/expected_differentexec.teamcity
+++ /dev/null
@@ -1,21 +0,0 @@
-********* Start testing of tst_TestA *********
-Config: Using QtTest library
-PASS   : tst_TestA::initTestCase()
-PASS   : tst_TestA::slotName()
-PASS   : tst_TestA::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_TestA *********
-********* Start testing of tst_TestA *********
-Config: Using QtTest library
-PASS   : tst_TestA::initTestCase()
-PASS   : tst_TestA::slotName()
-PASS   : tst_TestA::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_TestA *********
-********* Start testing of tst_TestB *********
-Config: Using QtTest library
-PASS   : tst_TestB::initTestCase()
-PASS   : tst_TestB::slotName()
-PASS   : tst_TestB::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_TestB *********
diff --git a/tests/auto/testlib/selftests/expected_differentexec.xml b/tests/auto/testlib/selftests/expected_differentexec.xml
deleted file mode 100644
index 30ee50bc08..0000000000
--- a/tests/auto/testlib/selftests/expected_differentexec.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-********* Start testing of tst_TestA *********
-Config: Using QtTest library
-PASS   : tst_TestA::initTestCase()
-PASS   : tst_TestA::slotName()
-PASS   : tst_TestA::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_TestA *********
-********* Start testing of tst_TestA *********
-Config: Using QtTest library
-PASS   : tst_TestA::initTestCase()
-PASS   : tst_TestA::slotName()
-PASS   : tst_TestA::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_TestA *********
-********* Start testing of tst_TestB *********
-Config: Using QtTest library
-PASS   : tst_TestB::initTestCase()
-PASS   : tst_TestB::slotName()
-PASS   : tst_TestB::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_TestB *********
diff --git a/tests/auto/testlib/selftests/expected_mouse.junitxml b/tests/auto/testlib/selftests/expected_mouse.junitxml
new file mode 100644
index 0000000000..0664ab3a34
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_mouse.junitxml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite name="tst_Mouse" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="13" failures="0" errors="0" skipped="3" time="@TEST_DURATION@">
+  <properties>
+    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
+    <property name="QtBuild" value=""/>
+  </properties>
+  <testcase name="initTestCase" classname="tst_Mouse" time="@TEST_DURATION@"/>
+  <testcase name="timestampBetweenTestFunction(press, release)" classname="tst_Mouse" time="@TEST_DURATION@"/>
+  <testcase name="timestampBetweenTestFunction(press, release, hover)" classname="tst_Mouse" time="@TEST_DURATION@"/>
+  <testcase name="timestampBetweenTestFunction(hover)" classname="tst_Mouse" time="@TEST_DURATION@"/>
+  <testcase name="timestampBetweenTestFunction(hover #2)" classname="tst_Mouse" time="@TEST_DURATION@"/>
+  <testcase name="timestampBetweenTestFunction(press, release #2)" classname="tst_Mouse" time="@TEST_DURATION@"/>
+  <testcase name="timestampBetweenTestFunction(press, release, hover #2)" classname="tst_Mouse" time="@TEST_DURATION@"/>
+  <testcase name="stateHandlingPart1(dummy&#x002D;1)" classname="tst_Mouse" time="@TEST_DURATION@"/>
+  <testcase name="stateHandlingPart1(dummy&#x002D;2)" classname="tst_Mouse" time="@TEST_DURATION@"/>
+  <testcase name="stateHandlingPart2" classname="tst_Mouse" time="@TEST_DURATION@">
+    <skipped message="Not implemented beyond this point!"/>
+  </testcase>
+  <testcase name="deterministicEvents(first&#x002D;run&#x002D;true)" classname="tst_Mouse" time="@TEST_DURATION@">
+    <skipped message="Not implemented!"/>
+  </testcase>
+  <testcase name="deterministicEvents(first&#x002D;run&#x002D;false)" classname="tst_Mouse" time="@TEST_DURATION@">
+    <skipped message="Not implemented!"/>
+  </testcase>
+  <testcase name="cleanupTestCase" classname="tst_Mouse" time="@TEST_DURATION@"/>
+</testsuite>
diff --git a/tests/auto/testlib/selftests/expected_mouse.lightxml b/tests/auto/testlib/selftests/expected_mouse.lightxml
new file mode 100644
index 0000000000..a691dbd931
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_mouse.lightxml
@@ -0,0 +1,61 @@
+<Environment>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QtBuild/>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
+</Environment>
+<TestFunction name="initTestCase">
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="timestampBetweenTestFunction">
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[press, release]]></DataTag>
+</Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[press, release, hover]]></DataTag>
+</Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[hover]]></DataTag>
+</Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[hover #2]]></DataTag>
+</Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[press, release #2]]></DataTag>
+</Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[press, release, hover #2]]></DataTag>
+</Incident>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="stateHandlingPart1">
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[dummy-1]]></DataTag>
+</Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[dummy-2]]></DataTag>
+</Incident>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="stateHandlingPart2">
+<Message type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0">
+    <Description><![CDATA[Not implemented beyond this point!]]></Description>
+</Message>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="deterministicEvents">
+<Message type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0">
+    <DataTag><![CDATA[first-run-true]]></DataTag>
+    <Description><![CDATA[Not implemented!]]></Description>
+</Message>
+<Message type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0">
+    <DataTag><![CDATA[first-run-false]]></DataTag>
+    <Description><![CDATA[Not implemented!]]></Description>
+</Message>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="cleanupTestCase">
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_mouse.tap b/tests/auto/testlib/selftests/expected_mouse.tap
new file mode 100644
index 0000000000..a91b5b4da2
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_mouse.tap
@@ -0,0 +1,19 @@
+TAP version 13
+# tst_Mouse
+ok 1 - initTestCase()
+ok 2 - timestampBetweenTestFunction(press, release)
+ok 3 - timestampBetweenTestFunction(press, release, hover)
+ok 4 - timestampBetweenTestFunction(hover)
+ok 5 - timestampBetweenTestFunction(hover #2)
+ok 6 - timestampBetweenTestFunction(press, release #2)
+ok 7 - timestampBetweenTestFunction(press, release, hover #2)
+ok 8 - stateHandlingPart1(dummy-1)
+ok 9 - stateHandlingPart1(dummy-2)
+ok 10 - stateHandlingPart2() # SKIP Not implemented beyond this point!
+ok 11 - deterministicEvents(first-run-true) # SKIP Not implemented!
+ok 12 - deterministicEvents(first-run-false) # SKIP Not implemented!
+ok 13 - cleanupTestCase()
+1..13
+# tests 13
+# pass 10
+# fail 0
diff --git a/tests/auto/testlib/selftests/expected_mouse.teamcity b/tests/auto/testlib/selftests/expected_mouse.teamcity
new file mode 100644
index 0000000000..00004611b3
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_mouse.teamcity
@@ -0,0 +1,25 @@
+##teamcity[testSuiteStarted name='tst_Mouse' flowId='tst_Mouse']
+##teamcity[testStarted name='initTestCase()' flowId='tst_Mouse']
+##teamcity[testFinished name='initTestCase()' flowId='tst_Mouse']
+##teamcity[testStarted name='timestampBetweenTestFunction(press, release)' flowId='tst_Mouse']
+##teamcity[testFinished name='timestampBetweenTestFunction(press, release)' flowId='tst_Mouse']
+##teamcity[testStarted name='timestampBetweenTestFunction(press, release, hover)' flowId='tst_Mouse']
+##teamcity[testFinished name='timestampBetweenTestFunction(press, release, hover)' flowId='tst_Mouse']
+##teamcity[testStarted name='timestampBetweenTestFunction(hover)' flowId='tst_Mouse']
+##teamcity[testFinished name='timestampBetweenTestFunction(hover)' flowId='tst_Mouse']
+##teamcity[testStarted name='timestampBetweenTestFunction(hover #2)' flowId='tst_Mouse']
+##teamcity[testFinished name='timestampBetweenTestFunction(hover #2)' flowId='tst_Mouse']
+##teamcity[testStarted name='timestampBetweenTestFunction(press, release #2)' flowId='tst_Mouse']
+##teamcity[testFinished name='timestampBetweenTestFunction(press, release #2)' flowId='tst_Mouse']
+##teamcity[testStarted name='timestampBetweenTestFunction(press, release, hover #2)' flowId='tst_Mouse']
+##teamcity[testFinished name='timestampBetweenTestFunction(press, release, hover #2)' flowId='tst_Mouse']
+##teamcity[testStarted name='stateHandlingPart1(dummy-1)' flowId='tst_Mouse']
+##teamcity[testFinished name='stateHandlingPart1(dummy-1)' flowId='tst_Mouse']
+##teamcity[testStarted name='stateHandlingPart1(dummy-2)' flowId='tst_Mouse']
+##teamcity[testFinished name='stateHandlingPart1(dummy-2)' flowId='tst_Mouse']
+##teamcity[testIgnored name='stateHandlingPart2()' message='Not implemented beyond this point! |[Loc: qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp(0)|]' flowId='tst_Mouse']
+##teamcity[testIgnored name='deterministicEvents(first-run-true)' message='Not implemented! |[Loc: qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp(0)|]' flowId='tst_Mouse']
+##teamcity[testIgnored name='deterministicEvents(first-run-false)' message='Not implemented! |[Loc: qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp(0)|]' flowId='tst_Mouse']
+##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Mouse']
+##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Mouse']
+##teamcity[testSuiteFinished name='tst_Mouse' flowId='tst_Mouse']
diff --git a/tests/auto/testlib/selftests/expected_mouse.txt b/tests/auto/testlib/selftests/expected_mouse.txt
new file mode 100644
index 0000000000..660b4f47a4
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_mouse.txt
@@ -0,0 +1,20 @@
+********* Start testing of tst_Mouse *********
+Config: Using QtTest library
+PASS   : tst_Mouse::initTestCase()
+PASS   : tst_Mouse::timestampBetweenTestFunction(press, release)
+PASS   : tst_Mouse::timestampBetweenTestFunction(press, release, hover)
+PASS   : tst_Mouse::timestampBetweenTestFunction(hover)
+PASS   : tst_Mouse::timestampBetweenTestFunction(hover #2)
+PASS   : tst_Mouse::timestampBetweenTestFunction(press, release #2)
+PASS   : tst_Mouse::timestampBetweenTestFunction(press, release, hover #2)
+PASS   : tst_Mouse::stateHandlingPart1(dummy-1)
+PASS   : tst_Mouse::stateHandlingPart1(dummy-2)
+SKIP   : tst_Mouse::stateHandlingPart2() Not implemented beyond this point!
+   Loc: [qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp(0)]
+SKIP   : tst_Mouse::deterministicEvents(first-run-true) Not implemented!
+   Loc: [qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp(0)]
+SKIP   : tst_Mouse::deterministicEvents(first-run-false) Not implemented!
+   Loc: [qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp(0)]
+PASS   : tst_Mouse::cleanupTestCase()
+Totals: 10 passed, 0 failed, 3 skipped, 0 blacklisted, 0ms
+********* Finished testing of tst_Mouse *********
diff --git a/tests/auto/testlib/selftests/expected_mouse.xml b/tests/auto/testlib/selftests/expected_mouse.xml
new file mode 100644
index 0000000000..3fb68a72ed
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_mouse.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestCase name="tst_Mouse">
+<Environment>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QtBuild/>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
+</Environment>
+<TestFunction name="initTestCase">
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="timestampBetweenTestFunction">
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[press, release]]></DataTag>
+</Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[press, release, hover]]></DataTag>
+</Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[hover]]></DataTag>
+</Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[hover #2]]></DataTag>
+</Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[press, release #2]]></DataTag>
+</Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[press, release, hover #2]]></DataTag>
+</Incident>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="stateHandlingPart1">
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[dummy-1]]></DataTag>
+</Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[dummy-2]]></DataTag>
+</Incident>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="stateHandlingPart2">
+<Message type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0">
+    <Description><![CDATA[Not implemented beyond this point!]]></Description>
+</Message>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="deterministicEvents">
+<Message type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0">
+    <DataTag><![CDATA[first-run-true]]></DataTag>
+    <Description><![CDATA[Not implemented!]]></Description>
+</Message>
+<Message type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0">
+    <DataTag><![CDATA[first-run-false]]></DataTag>
+    <Description><![CDATA[Not implemented!]]></Description>
+</Message>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="cleanupTestCase">
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<Duration msecs="0"/>
+</TestCase>
diff --git a/tests/auto/testlib/selftests/expected_multiexec.junitxml b/tests/auto/testlib/selftests/expected_multiexec.junitxml
deleted file mode 100644
index 3b8db5466f..0000000000
--- a/tests/auto/testlib/selftests/expected_multiexec.junitxml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="0" time="@TEST_DURATION@">
-  <properties>
-    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtBuild" value=""/>
-  </properties>
-  <testcase name="initTestCase" classname="tst_Nothing" time="@TEST_DURATION@"/>
-  <testcase name="nothing" classname="tst_Nothing" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" classname="tst_Nothing" time="@TEST_DURATION@"/>
-</testsuite>
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="0" time="@TEST_DURATION@">
-  <properties>
-    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtBuild" value=""/>
-  </properties>
-  <testcase name="initTestCase" classname="tst_Nothing" time="@TEST_DURATION@"/>
-  <testcase name="nothing" classname="tst_Nothing" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" classname="tst_Nothing" time="@TEST_DURATION@"/>
-</testsuite>
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="0" time="@TEST_DURATION@">
-  <properties>
-    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtBuild" value=""/>
-  </properties>
-  <testcase name="initTestCase" classname="tst_Nothing" time="@TEST_DURATION@"/>
-  <testcase name="nothing" classname="tst_Nothing" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" classname="tst_Nothing" time="@TEST_DURATION@"/>
-</testsuite>
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="0" time="@TEST_DURATION@">
-  <properties>
-    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtBuild" value=""/>
-  </properties>
-  <testcase name="initTestCase" classname="tst_Nothing" time="@TEST_DURATION@"/>
-  <testcase name="nothing" classname="tst_Nothing" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" classname="tst_Nothing" time="@TEST_DURATION@"/>
-</testsuite>
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" skipped="0" time="@TEST_DURATION@">
-  <properties>
-    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtBuild" value=""/>
-  </properties>
-  <testcase name="initTestCase" classname="tst_Nothing" time="@TEST_DURATION@"/>
-  <testcase name="nothing" classname="tst_Nothing" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" classname="tst_Nothing" time="@TEST_DURATION@"/>
-</testsuite>
diff --git a/tests/auto/testlib/selftests/expected_multiexec.lightxml b/tests/auto/testlib/selftests/expected_multiexec.lightxml
deleted file mode 100644
index 344955f049..0000000000
--- a/tests/auto/testlib/selftests/expected_multiexec.lightxml
+++ /dev/null
@@ -1,90 +0,0 @@
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QtBuild/>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-</Environment>
-<TestFunction name="initTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="nothing">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="cleanupTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<Duration msecs="0"/>
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QtBuild/>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-</Environment>
-<TestFunction name="initTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="nothing">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="cleanupTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<Duration msecs="0"/>
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QtBuild/>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-</Environment>
-<TestFunction name="initTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="nothing">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="cleanupTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<Duration msecs="0"/>
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QtBuild/>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-</Environment>
-<TestFunction name="initTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="nothing">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="cleanupTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<Duration msecs="0"/>
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QtBuild/>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-</Environment>
-<TestFunction name="initTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="nothing">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="cleanupTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_multiexec.tap b/tests/auto/testlib/selftests/expected_multiexec.tap
deleted file mode 100644
index ce6a7b37dd..0000000000
--- a/tests/auto/testlib/selftests/expected_multiexec.tap
+++ /dev/null
@@ -1,45 +0,0 @@
-TAP version 13
-# tst_Nothing
-ok 1 - initTestCase()
-ok 2 - nothing()
-ok 3 - cleanupTestCase()
-1..3
-# tests 3
-# pass 3
-# fail 0
-TAP version 13
-# tst_Nothing
-ok 1 - initTestCase()
-ok 2 - nothing()
-ok 3 - cleanupTestCase()
-1..3
-# tests 3
-# pass 3
-# fail 0
-TAP version 13
-# tst_Nothing
-ok 1 - initTestCase()
-ok 2 - nothing()
-ok 3 - cleanupTestCase()
-1..3
-# tests 3
-# pass 3
-# fail 0
-TAP version 13
-# tst_Nothing
-ok 1 - initTestCase()
-ok 2 - nothing()
-ok 3 - cleanupTestCase()
-1..3
-# tests 3
-# pass 3
-# fail 0
-TAP version 13
-# tst_Nothing
-ok 1 - initTestCase()
-ok 2 - nothing()
-ok 3 - cleanupTestCase()
-1..3
-# tests 3
-# pass 3
-# fail 0
diff --git a/tests/auto/testlib/selftests/expected_multiexec.teamcity b/tests/auto/testlib/selftests/expected_multiexec.teamcity
deleted file mode 100644
index db2aa90272..0000000000
--- a/tests/auto/testlib/selftests/expected_multiexec.teamcity
+++ /dev/null
@@ -1,40 +0,0 @@
-##teamcity[testSuiteStarted name='tst_Nothing' flowId='tst_Nothing']
-##teamcity[testStarted name='initTestCase()' flowId='tst_Nothing']
-##teamcity[testFinished name='initTestCase()' flowId='tst_Nothing']
-##teamcity[testStarted name='nothing()' flowId='tst_Nothing']
-##teamcity[testFinished name='nothing()' flowId='tst_Nothing']
-##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Nothing']
-##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Nothing']
-##teamcity[testSuiteFinished name='tst_Nothing' flowId='tst_Nothing']
-##teamcity[testSuiteStarted name='tst_Nothing' flowId='tst_Nothing']
-##teamcity[testStarted name='initTestCase()' flowId='tst_Nothing']
-##teamcity[testFinished name='initTestCase()' flowId='tst_Nothing']
-##teamcity[testStarted name='nothing()' flowId='tst_Nothing']
-##teamcity[testFinished name='nothing()' flowId='tst_Nothing']
-##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Nothing']
-##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Nothing']
-##teamcity[testSuiteFinished name='tst_Nothing' flowId='tst_Nothing']
-##teamcity[testSuiteStarted name='tst_Nothing' flowId='tst_Nothing']
-##teamcity[testStarted name='initTestCase()' flowId='tst_Nothing']
-##teamcity[testFinished name='initTestCase()' flowId='tst_Nothing']
-##teamcity[testStarted name='nothing()' flowId='tst_Nothing']
-##teamcity[testFinished name='nothing()' flowId='tst_Nothing']
-##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Nothing']
-##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Nothing']
-##teamcity[testSuiteFinished name='tst_Nothing' flowId='tst_Nothing']
-##teamcity[testSuiteStarted name='tst_Nothing' flowId='tst_Nothing']
-##teamcity[testStarted name='initTestCase()' flowId='tst_Nothing']
-##teamcity[testFinished name='initTestCase()' flowId='tst_Nothing']
-##teamcity[testStarted name='nothing()' flowId='tst_Nothing']
-##teamcity[testFinished name='nothing()' flowId='tst_Nothing']
-##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Nothing']
-##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Nothing']
-##teamcity[testSuiteFinished name='tst_Nothing' flowId='tst_Nothing']
-##teamcity[testSuiteStarted name='tst_Nothing' flowId='tst_Nothing']
-##teamcity[testStarted name='initTestCase()' flowId='tst_Nothing']
-##teamcity[testFinished name='initTestCase()' flowId='tst_Nothing']
-##teamcity[testStarted name='nothing()' flowId='tst_Nothing']
-##teamcity[testFinished name='nothing()' flowId='tst_Nothing']
-##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Nothing']
-##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Nothing']
-##teamcity[testSuiteFinished name='tst_Nothing' flowId='tst_Nothing']
diff --git a/tests/auto/testlib/selftests/expected_multiexec.xml b/tests/auto/testlib/selftests/expected_multiexec.xml
deleted file mode 100644
index e160b4f3e6..0000000000
--- a/tests/auto/testlib/selftests/expected_multiexec.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestCase name="tst_Nothing">
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QtBuild/>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-</Environment>
-<TestFunction name="initTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="nothing">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="cleanupTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<Duration msecs="0"/>
-</TestCase>
-<?xml version="1.0" encoding="UTF-8"?>
-<TestCase name="tst_Nothing">
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QtBuild/>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-</Environment>
-<TestFunction name="initTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="nothing">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="cleanupTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<Duration msecs="0"/>
-</TestCase>
-<?xml version="1.0" encoding="UTF-8"?>
-<TestCase name="tst_Nothing">
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QtBuild/>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-</Environment>
-<TestFunction name="initTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="nothing">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="cleanupTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<Duration msecs="0"/>
-</TestCase>
-<?xml version="1.0" encoding="UTF-8"?>
-<TestCase name="tst_Nothing">
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QtBuild/>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-</Environment>
-<TestFunction name="initTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="nothing">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="cleanupTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<Duration msecs="0"/>
-</TestCase>
-<?xml version="1.0" encoding="UTF-8"?>
-<TestCase name="tst_Nothing">
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QtBuild/>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-</Environment>
-<TestFunction name="initTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="nothing">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="cleanupTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<Duration msecs="0"/>
-</TestCase>
diff --git a/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml b/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml
deleted file mode 100644
index dfe937d59a..0000000000
--- a/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_QExecStringList" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="0" errors="0" skipped="0" time="@TEST_DURATION@">
-  <properties>
-    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtBuild" value=""/>
-  </properties>
-  <testcase name="initTestCase" classname="tst_QExecStringList" time="@TEST_DURATION@"/>
-  <testcase name="testA" classname="tst_QExecStringList" time="@TEST_DURATION@"/>
-  <testcase name="testB(Data1)" classname="tst_QExecStringList" time="@TEST_DURATION@"/>
-  <testcase name="testB(Data2)" classname="tst_QExecStringList" time="@TEST_DURATION@"/>
-  <testcase name="testB(Data3)" classname="tst_QExecStringList" time="@TEST_DURATION@"/>
-  <testcase name="testC" classname="tst_QExecStringList" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" classname="tst_QExecStringList" time="@TEST_DURATION@"/>
-</testsuite>
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testA()
-PASS   : tst_QExecStringList::testB(Data1)
-PASS   : tst_QExecStringList::testB(Data2)
-PASS   : tst_QExecStringList::testB(Data3)
-PASS   : tst_QExecStringList::testC()
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 7 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testA()
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testB(Data1)
-PASS   : tst_QExecStringList::testB(Data2)
-PASS   : tst_QExecStringList::testB(Data3)
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 5 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testB(Data2)
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testC()
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
diff --git a/tests/auto/testlib/selftests/expected_qexecstringlist.lightxml b/tests/auto/testlib/selftests/expected_qexecstringlist.lightxml
deleted file mode 100644
index c6db60bb1f..0000000000
--- a/tests/auto/testlib/selftests/expected_qexecstringlist.lightxml
+++ /dev/null
@@ -1,75 +0,0 @@
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QtBuild/>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-</Environment>
-<TestFunction name="initTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="testA">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="testB">
-<Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[Data1]]></DataTag>
-</Incident>
-<Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[Data2]]></DataTag>
-</Incident>
-<Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[Data3]]></DataTag>
-</Incident>
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="testC">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="cleanupTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<Duration msecs="0"/>
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testA()
-PASS   : tst_QExecStringList::testB(Data1)
-PASS   : tst_QExecStringList::testB(Data2)
-PASS   : tst_QExecStringList::testB(Data3)
-PASS   : tst_QExecStringList::testC()
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 7 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testA()
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testB(Data1)
-PASS   : tst_QExecStringList::testB(Data2)
-PASS   : tst_QExecStringList::testB(Data3)
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 5 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testB(Data2)
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testC()
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
diff --git a/tests/auto/testlib/selftests/expected_qexecstringlist.tap b/tests/auto/testlib/selftests/expected_qexecstringlist.tap
deleted file mode 100644
index 45aa7c4a3c..0000000000
--- a/tests/auto/testlib/selftests/expected_qexecstringlist.tap
+++ /dev/null
@@ -1,54 +0,0 @@
-TAP version 13
-# tst_QExecStringList
-ok 1 - initTestCase()
-ok 2 - testA()
-ok 3 - testB(Data1)
-ok 4 - testB(Data2)
-ok 5 - testB(Data3)
-ok 6 - testC()
-ok 7 - cleanupTestCase()
-1..7
-# tests 7
-# pass 7
-# fail 0
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testA()
-PASS   : tst_QExecStringList::testB(Data1)
-PASS   : tst_QExecStringList::testB(Data2)
-PASS   : tst_QExecStringList::testB(Data3)
-PASS   : tst_QExecStringList::testC()
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 7 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testA()
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testB(Data1)
-PASS   : tst_QExecStringList::testB(Data2)
-PASS   : tst_QExecStringList::testB(Data3)
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 5 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testB(Data2)
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testC()
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
diff --git a/tests/auto/testlib/selftests/expected_qexecstringlist.teamcity b/tests/auto/testlib/selftests/expected_qexecstringlist.teamcity
deleted file mode 100644
index bb7ae829dd..0000000000
--- a/tests/auto/testlib/selftests/expected_qexecstringlist.teamcity
+++ /dev/null
@@ -1,57 +0,0 @@
-##teamcity[testSuiteStarted name='tst_QExecStringList' flowId='tst_QExecStringList']
-##teamcity[testStarted name='initTestCase()' flowId='tst_QExecStringList']
-##teamcity[testFinished name='initTestCase()' flowId='tst_QExecStringList']
-##teamcity[testStarted name='testA()' flowId='tst_QExecStringList']
-##teamcity[testFinished name='testA()' flowId='tst_QExecStringList']
-##teamcity[testStarted name='testB(Data1)' flowId='tst_QExecStringList']
-##teamcity[testFinished name='testB(Data1)' flowId='tst_QExecStringList']
-##teamcity[testStarted name='testB(Data2)' flowId='tst_QExecStringList']
-##teamcity[testFinished name='testB(Data2)' flowId='tst_QExecStringList']
-##teamcity[testStarted name='testB(Data3)' flowId='tst_QExecStringList']
-##teamcity[testFinished name='testB(Data3)' flowId='tst_QExecStringList']
-##teamcity[testStarted name='testC()' flowId='tst_QExecStringList']
-##teamcity[testFinished name='testC()' flowId='tst_QExecStringList']
-##teamcity[testStarted name='cleanupTestCase()' flowId='tst_QExecStringList']
-##teamcity[testFinished name='cleanupTestCase()' flowId='tst_QExecStringList']
-##teamcity[testSuiteFinished name='tst_QExecStringList' flowId='tst_QExecStringList']
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testA()
-PASS   : tst_QExecStringList::testB(Data1)
-PASS   : tst_QExecStringList::testB(Data2)
-PASS   : tst_QExecStringList::testB(Data3)
-PASS   : tst_QExecStringList::testC()
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 7 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testA()
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testB(Data1)
-PASS   : tst_QExecStringList::testB(Data2)
-PASS   : tst_QExecStringList::testB(Data3)
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 5 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testB(Data2)
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testC()
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
diff --git a/tests/auto/testlib/selftests/expected_qexecstringlist.xml b/tests/auto/testlib/selftests/expected_qexecstringlist.xml
deleted file mode 100644
index 403d2725b0..0000000000
--- a/tests/auto/testlib/selftests/expected_qexecstringlist.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestCase name="tst_QExecStringList">
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QtBuild/>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-</Environment>
-<TestFunction name="initTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="testA">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="testB">
-<Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[Data1]]></DataTag>
-</Incident>
-<Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[Data2]]></DataTag>
-</Incident>
-<Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[Data3]]></DataTag>
-</Incident>
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="testC">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<TestFunction name="cleanupTestCase">
-<Incident type="pass" file="" line="0" />
-    <Duration msecs="0"/>
-</TestFunction>
-<Duration msecs="0"/>
-</TestCase>
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testA()
-PASS   : tst_QExecStringList::testB(Data1)
-PASS   : tst_QExecStringList::testB(Data2)
-PASS   : tst_QExecStringList::testB(Data3)
-PASS   : tst_QExecStringList::testC()
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 7 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testA()
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testB(Data1)
-PASS   : tst_QExecStringList::testB(Data2)
-PASS   : tst_QExecStringList::testB(Data3)
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 5 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testB(Data2)
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
-********* Start testing of tst_QExecStringList *********
-Config: Using QtTest library
-PASS   : tst_QExecStringList::initTestCase()
-PASS   : tst_QExecStringList::testC()
-PASS   : tst_QExecStringList::cleanupTestCase()
-Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
-********* Finished testing of tst_QExecStringList *********
diff --git a/tests/auto/testlib/selftests/expected_sleep.junitxml b/tests/auto/testlib/selftests/expected_sleep.junitxml
deleted file mode 100644
index c635cdc772..0000000000
--- a/tests/auto/testlib/selftests/expected_sleep.junitxml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Sleep" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="4" failures="0" errors="0" skipped="0" time="@TEST_DURATION@">
-  <properties>
-    <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
-    <property name="QtBuild" value=""/>
-  </properties>
-  <testcase name="initTestCase" classname="tst_Sleep" time="@TEST_DURATION@"/>
-  <testcase name="sleep" classname="tst_Sleep" time="@TEST_DURATION@"/>
-  <testcase name="wait" classname="tst_Sleep" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" classname="tst_Sleep" time="@TEST_DURATION@"/>
-</testsuite>
diff --git a/tests/auto/testlib/selftests/expected_sleep.tap b/tests/auto/testlib/selftests/expected_sleep.tap
deleted file mode 100644
index 65edefb9ba..0000000000
--- a/tests/auto/testlib/selftests/expected_sleep.tap
+++ /dev/null
@@ -1,10 +0,0 @@
-TAP version 13
-# tst_Sleep
-ok 1 - initTestCase()
-ok 2 - sleep()
-ok 3 - wait()
-ok 4 - cleanupTestCase()
-1..4
-# tests 4
-# pass 4
-# fail 0
diff --git a/tests/auto/testlib/selftests/expected_sleep.teamcity b/tests/auto/testlib/selftests/expected_sleep.teamcity
deleted file mode 100644
index 45a503bb54..0000000000
--- a/tests/auto/testlib/selftests/expected_sleep.teamcity
+++ /dev/null
@@ -1,10 +0,0 @@
-##teamcity[testSuiteStarted name='tst_Sleep' flowId='tst_Sleep']
-##teamcity[testStarted name='initTestCase()' flowId='tst_Sleep']
-##teamcity[testFinished name='initTestCase()' flowId='tst_Sleep']
-##teamcity[testStarted name='sleep()' flowId='tst_Sleep']
-##teamcity[testFinished name='sleep()' flowId='tst_Sleep']
-##teamcity[testStarted name='wait()' flowId='tst_Sleep']
-##teamcity[testFinished name='wait()' flowId='tst_Sleep']
-##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Sleep']
-##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Sleep']
-##teamcity[testSuiteFinished name='tst_Sleep' flowId='tst_Sleep']
diff --git a/tests/auto/testlib/selftests/generate_expected_output.py b/tests/auto/testlib/selftests/generate_expected_output.py
index 677b65b33b..7f639a6efd 100755
--- a/tests/auto/testlib/selftests/generate_expected_output.py
+++ b/tests/auto/testlib/selftests/generate_expected_output.py
@@ -49,7 +49,7 @@ the saved copies of the output.
 """
 
 
-DEFAULT_FORMATS = ['xml', 'txt', 'junitxml', 'lightxml', 'teamcity', 'tap']
+DEFAULT_FORMATS = ['xml', 'txt', 'junitxml', 'lightxml', 'teamcity', 'tap', 'csv']
 
 
 TESTS = ['assert', 'badxml', 'benchlibcallgrind', 'benchlibcounting',
@@ -59,7 +59,7 @@ TESTS = ['assert', 'badxml', 'benchlibcallgrind', 'benchlibcounting',
          'deleteLater_noApp', 'differentexec', 'exceptionthrow', 'expectfail',
          'failcleanup', 'faildatatype', 'failfetchtype', 'failinit',
          'failinitdata', 'fetchbogus', 'findtestdata', 'float', 'globaldata',
-         'longstring', 'maxwarnings', 'multiexec', 'pairdiagnostics', 'pass',
+         'longstring', 'maxwarnings', 'mouse', 'multiexec', 'pairdiagnostics', 'pass',
          'printdatatags', 'printdatatagswithglobaltags', 'qexecstringlist',
          'signaldumper', 'silent', 'singleskip', 'skip', 'skipcleanup',
          'skipinit', 'skipinitdata', 'sleep', 'strcmp', 'subtest', 'testlib',
@@ -199,6 +199,8 @@ class Scanner (object):
             for d in given:
                 if not os.path.isdir(d):
                     print('No such directory:', d, '- skipped')
+                elif skip_callgrind and d == 'benchlibcallgrind':
+                    pass # Skip this test, as requeted.
                 elif d in TESTS:
                     yield d
                 else:
@@ -281,11 +283,38 @@ def testEnv(testname,
         data.update(extraEnv[testname])
     return data
 
-# See TestLogger::shouldIgnoreTest() in tst_selftest.cpp
 def shouldIgnoreTest(testname, format):
-    if testname == "junit" and not format == "junitxml":
+    """Test whether to exclude a test/format combination.
+
+    See TestLogger::shouldIgnoreTest() in tst_selftests.cpp; it starts
+    with various exclusions for opt-in tests, platform dependencies
+    and tool availability; we ignore those, as we need the test data
+    to be present when those exclusions aren't in effect.
+
+    In the remainder, exclude what it always excludes.
+    """
+    if format != 'txt':
+        if testname in ("differentexec",
+                        "multiexec",
+                        "qexecstringlist",
+                        "benchliboptions",
+                        "printdatatags",
+                        "printdatatagswithglobaltags",
+                        "silent",
+                        "crashes",
+                        "benchlibcallgrind",
+                        "float",
+                        "sleep"):
+            return True
+
+    if testname == "badxml" and not format.endswith('xml'):
         return True
-    if testname in ["float", "silent"] and not format == "txt":
+
+    # Skip benchlib* for teamcity, and everything else for csv:
+    if format == ('teamcity' if testname.startswith('benchlib') else 'csv'):
+        return True
+
+    if testname == "junit" and format != "junitxml":
         return True
 
     return False
@@ -335,6 +364,15 @@ def main(argv):
     cleaner = Cleaner()
     src_dir = cleaner.sourceDir
 
+    if not options.skip_callgrind:
+        # Skip it, even if not requested, when valgrind isn't available:
+        try:
+            probe = subprocess.Popen(['valgrind', '--version'], stdout=subprocess.PIPE,
+                                     env=testEnv('benchlibcallgrind'), universal_newlines=True)
+        except FileNotFoundError:
+            options.skip_callgrind = True
+            print("Failed to find valgrind, skipping benchlibcallgrind test")
+
     tests = tuple(Scanner().subdirs(options.subtests, options.skip_callgrind))
     print("Generating", len(tests), "test results for", cleaner.version, "in:", src_dir)
     for path in tests:
diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp
index 5fdd5aa6d9..2ef3f921dc 100644
--- a/tests/auto/testlib/selftests/tst_selftests.cpp
+++ b/tests/auto/testlib/selftests/tst_selftests.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Copyright (C) 2016 Intel Corporation.
 ** Contact: https://www.qt.io/licensing/
 **
@@ -658,9 +658,6 @@ bool TestLogger::shouldIgnoreTest(const QString &test) const
         return true;
 #endif
 
-    if (test == "deleteLater" || test == "deleteLater_noApp" || test == "mouse")
-        return true; // Missing expectation files
-
     // These tests are affected by timing and whether the CPU tick counter
     // is monotonically increasing. They won't work on some machines so
     // leave them off by default. Feel free to enable them for your own
@@ -744,12 +741,10 @@ bool TestLogger::shouldIgnoreTest(const QString &test) const
             || logger == QTestLog::LightXML || logger == QTestLog::JUnitXML))
         return true;
 
-    if (logger == QTestLog::CSV && !test.startsWith("benchlib"))
+    // Skip benchmark for TeamCity logger, skip everything else for CSV:
+    if (logger == (test.startsWith("benchlib") ? QTestLog::TeamCity : QTestLog::CSV))
         return true;
 
-    if (logger == QTestLog::TeamCity && test.startsWith("benchlib"))
-        return true; // Skip benchmark for TeamCity logger
-
     if (logger != QTestLog::JUnitXML && test == "junit")
         return true;