217 files changed, 7 insertions, 3 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index c16f00ff8b..8319e4aa20 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -6,7 +6,8 @@ SUBDIRS += \
     network.pro \
     sql \
     xml \
-    other
+    testlib \
+    other \
 
 !cross_compile:                             SUBDIRS += host.pro
 contains(QT_CONFIG, opengl):                SUBDIRS += opengl
diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro
index 5282e08f17..7269f890a7 100644
--- a/tests/auto/corelib.pro
+++ b/tests/auto/corelib.pro
@@ -4,6 +4,4 @@ SUBDIRS=\
    collections \
    exceptionsafety \
    qobjectrace \
-   qsignalspy \
-   selftests \
    utf8
diff --git a/tests/auto/qsignalspy/.gitignore b/tests/auto/testlib/qsignalspy/.gitignore
index 4d5c31727e..4d5c31727e 100644
--- a/tests/auto/qsignalspy/.gitignore
+++ b/tests/auto/testlib/qsignalspy/.gitignore
diff --git a/tests/auto/qsignalspy/qsignalspy.pro b/tests/auto/testlib/qsignalspy/qsignalspy.pro
index d3ae63b5bc..d3ae63b5bc 100644
--- a/tests/auto/qsignalspy/qsignalspy.pro
+++ b/tests/auto/testlib/qsignalspy/qsignalspy.pro
diff --git a/tests/auto/qsignalspy/tst_qsignalspy.cpp b/tests/auto/testlib/qsignalspy/tst_qsignalspy.cpp
index f8e8553e7c..f8e8553e7c 100644
--- a/tests/auto/qsignalspy/tst_qsignalspy.cpp
+++ b/tests/auto/testlib/qsignalspy/tst_qsignalspy.cpp
diff --git a/tests/auto/selftests/.gitignore b/tests/auto/testlib/selftests/.gitignore
index 56ba17abd7..56ba17abd7 100644
--- a/tests/auto/selftests/.gitignore
+++ b/tests/auto/testlib/selftests/.gitignore
diff --git a/tests/auto/selftests/alive/.gitignore b/tests/auto/testlib/selftests/alive/.gitignore
index 561285c5d0..561285c5d0 100644
--- a/tests/auto/selftests/alive/.gitignore
+++ b/tests/auto/testlib/selftests/alive/.gitignore
diff --git a/tests/auto/selftests/alive/alive.pro b/tests/auto/testlib/selftests/alive/alive.pro
index 7660933a58..7660933a58 100644
--- a/tests/auto/selftests/alive/alive.pro
+++ b/tests/auto/testlib/selftests/alive/alive.pro
diff --git a/tests/auto/selftests/alive/qtestalive.cpp b/tests/auto/testlib/selftests/alive/qtestalive.cpp
index dd3d411ce5..dd3d411ce5 100644
--- a/tests/auto/selftests/alive/qtestalive.cpp
+++ b/tests/auto/testlib/selftests/alive/qtestalive.cpp
diff --git a/tests/auto/selftests/alive/tst_alive.cpp b/tests/auto/testlib/selftests/alive/tst_alive.cpp
index f29aebb176..f29aebb176 100644
--- a/tests/auto/selftests/alive/tst_alive.cpp
+++ b/tests/auto/testlib/selftests/alive/tst_alive.cpp
diff --git a/tests/auto/selftests/assert/assert.pro b/tests/auto/testlib/selftests/assert/assert.pro
index a1ed578a31..a1ed578a31 100644
--- a/tests/auto/selftests/assert/assert.pro
+++ b/tests/auto/testlib/selftests/assert/assert.pro
diff --git a/tests/auto/selftests/assert/tst_assert.cpp b/tests/auto/testlib/selftests/assert/tst_assert.cpp
index bd44162971..bd44162971 100644
--- a/tests/auto/selftests/assert/tst_assert.cpp
+++ b/tests/auto/testlib/selftests/assert/tst_assert.cpp
diff --git a/tests/auto/selftests/badxml/badxml.pro b/tests/auto/testlib/selftests/badxml/badxml.pro
index 126ac379d7..126ac379d7 100644
--- a/tests/auto/selftests/badxml/badxml.pro
+++ b/tests/auto/testlib/selftests/badxml/badxml.pro
diff --git a/tests/auto/selftests/badxml/tst_badxml.cpp b/tests/auto/testlib/selftests/badxml/tst_badxml.cpp
index 2d0b007df9..2d0b007df9 100644
--- a/tests/auto/selftests/badxml/tst_badxml.cpp
+++ b/tests/auto/testlib/selftests/badxml/tst_badxml.cpp
diff --git a/tests/auto/selftests/benchlibcallgrind/benchlibcallgrind.pro b/tests/auto/testlib/selftests/benchlibcallgrind/benchlibcallgrind.pro
index 50d056eae4..50d056eae4 100644
--- a/tests/auto/selftests/benchlibcallgrind/benchlibcallgrind.pro
+++ b/tests/auto/testlib/selftests/benchlibcallgrind/benchlibcallgrind.pro
diff --git a/tests/auto/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp b/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp
index 3505496829..3505496829 100644
--- a/tests/auto/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp
+++ b/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp
diff --git a/tests/auto/selftests/benchlibeventcounter/benchlibeventcounter.pro b/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro
index de978672f1..de978672f1 100644
--- a/tests/auto/selftests/benchlibeventcounter/benchlibeventcounter.pro
+++ b/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro
diff --git a/tests/auto/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp b/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp
index ccb69ddb6a..ccb69ddb6a 100644
--- a/tests/auto/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp
+++ b/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp
diff --git a/tests/auto/selftests/benchliboptions/benchliboptions.pro b/tests/auto/testlib/selftests/benchliboptions/benchliboptions.pro
index 118563003f..118563003f 100644
--- a/tests/auto/selftests/benchliboptions/benchliboptions.pro
+++ b/tests/auto/testlib/selftests/benchliboptions/benchliboptions.pro
diff --git a/tests/auto/selftests/benchliboptions/tst_benchliboptions.cpp b/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp
index cbe5af5ce8..cbe5af5ce8 100644
--- a/tests/auto/selftests/benchliboptions/tst_benchliboptions.cpp
+++ b/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp
diff --git a/tests/auto/selftests/benchlibtickcounter/benchlibtickcounter.pro b/tests/auto/testlib/selftests/benchlibtickcounter/benchlibtickcounter.pro
index b83ef441e1..b83ef441e1 100644
--- a/tests/auto/selftests/benchlibtickcounter/benchlibtickcounter.pro
+++ b/tests/auto/testlib/selftests/benchlibtickcounter/benchlibtickcounter.pro
diff --git a/tests/auto/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp b/tests/auto/testlib/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp
index cc8b3a454f..cc8b3a454f 100644
--- a/tests/auto/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp
+++ b/tests/auto/testlib/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp
diff --git a/tests/auto/selftests/benchlibwalltime/benchlibwalltime.pro b/tests/auto/testlib/selftests/benchlibwalltime/benchlibwalltime.pro
index 83b383da87..83b383da87 100644
--- a/tests/auto/selftests/benchlibwalltime/benchlibwalltime.pro
+++ b/tests/auto/testlib/selftests/benchlibwalltime/benchlibwalltime.pro
diff --git a/tests/auto/selftests/benchlibwalltime/tst_benchlibwalltime.cpp b/tests/auto/testlib/selftests/benchlibwalltime/tst_benchlibwalltime.cpp
index 9042c27936..9042c27936 100644
--- a/tests/auto/selftests/benchlibwalltime/tst_benchlibwalltime.cpp
+++ b/tests/auto/testlib/selftests/benchlibwalltime/tst_benchlibwalltime.cpp
diff --git a/tests/auto/selftests/cmptest/cmptest.pro b/tests/auto/testlib/selftests/cmptest/cmptest.pro
index 9c14987205..9c14987205 100644
--- a/tests/auto/selftests/cmptest/cmptest.pro
+++ b/tests/auto/testlib/selftests/cmptest/cmptest.pro
diff --git a/tests/auto/selftests/cmptest/tst_cmptest.cpp b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp
index 4d38aa1646..4d38aa1646 100644
--- a/tests/auto/selftests/cmptest/tst_cmptest.cpp
+++ b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp
diff --git a/tests/auto/selftests/commandlinedata/commandlinedata.pro b/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro
index e10ec404b3..e10ec404b3 100644
--- a/tests/auto/selftests/commandlinedata/commandlinedata.pro
+++ b/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro
diff --git a/tests/auto/selftests/commandlinedata/tst_commandlinedata.cpp b/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp
index 5f2dd3fffc..5f2dd3fffc 100644
--- a/tests/auto/selftests/commandlinedata/tst_commandlinedata.cpp
+++ b/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp
diff --git a/tests/auto/selftests/crashes/crashes.pro b/tests/auto/testlib/selftests/crashes/crashes.pro
index 8162e5ca0a..8162e5ca0a 100644
--- a/tests/auto/selftests/crashes/crashes.pro
+++ b/tests/auto/testlib/selftests/crashes/crashes.pro
diff --git a/tests/auto/selftests/crashes/tst_crashes.cpp b/tests/auto/testlib/selftests/crashes/tst_crashes.cpp
index d707414f5b..d707414f5b 100644
--- a/tests/auto/selftests/crashes/tst_crashes.cpp
+++ b/tests/auto/testlib/selftests/crashes/tst_crashes.cpp
diff --git a/tests/auto/selftests/datatable/datatable.pro b/tests/auto/testlib/selftests/datatable/datatable.pro
index 865e00e7f1..865e00e7f1 100644
--- a/tests/auto/selftests/datatable/datatable.pro
+++ b/tests/auto/testlib/selftests/datatable/datatable.pro
diff --git a/tests/auto/selftests/datatable/tst_datatable.cpp b/tests/auto/testlib/selftests/datatable/tst_datatable.cpp
index a55e9cbae2..a55e9cbae2 100644
--- a/tests/auto/selftests/datatable/tst_datatable.cpp
+++ b/tests/auto/testlib/selftests/datatable/tst_datatable.cpp
diff --git a/tests/auto/selftests/datetime/datetime.pro b/tests/auto/testlib/selftests/datetime/datetime.pro
index 34d6169538..34d6169538 100644
--- a/tests/auto/selftests/datetime/datetime.pro
+++ b/tests/auto/testlib/selftests/datetime/datetime.pro
diff --git a/tests/auto/selftests/datetime/tst_datetime.cpp b/tests/auto/testlib/selftests/datetime/tst_datetime.cpp
index 64126644db..64126644db 100644
--- a/tests/auto/selftests/datetime/tst_datetime.cpp
+++ b/tests/auto/testlib/selftests/datetime/tst_datetime.cpp
diff --git a/tests/auto/selftests/differentexec/differentexec.pro b/tests/auto/testlib/selftests/differentexec/differentexec.pro
index 84e20eec03..84e20eec03 100644
--- a/tests/auto/selftests/differentexec/differentexec.pro
+++ b/tests/auto/testlib/selftests/differentexec/differentexec.pro
diff --git a/tests/auto/selftests/differentexec/tst_differentexec.cpp b/tests/auto/testlib/selftests/differentexec/tst_differentexec.cpp
index 5061369776..5061369776 100644
--- a/tests/auto/selftests/differentexec/tst_differentexec.cpp
+++ b/tests/auto/testlib/selftests/differentexec/tst_differentexec.cpp
diff --git a/tests/auto/selftests/exceptionthrow/exceptionthrow.pro b/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro
index 62c782f6be..62c782f6be 100644
--- a/tests/auto/selftests/exceptionthrow/exceptionthrow.pro
+++ b/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro
diff --git a/tests/auto/selftests/exceptionthrow/tst_exceptionthrow.cpp b/tests/auto/testlib/selftests/exceptionthrow/tst_exceptionthrow.cpp
index 23cc89ca61..23cc89ca61 100644
--- a/tests/auto/selftests/exceptionthrow/tst_exceptionthrow.cpp
+++ b/tests/auto/testlib/selftests/exceptionthrow/tst_exceptionthrow.cpp
diff --git a/tests/auto/selftests/expected_alive.txt b/tests/auto/testlib/selftests/expected_alive.txt
index e1768ec881..e1768ec881 100644
--- a/tests/auto/selftests/expected_alive.txt
+++ b/tests/auto/testlib/selftests/expected_alive.txt
diff --git a/tests/auto/selftests/expected_assert.lightxml b/tests/auto/testlib/selftests/expected_assert.lightxml
index c9a1978e9e..c9a1978e9e 100644
--- a/tests/auto/selftests/expected_assert.lightxml
+++ b/tests/auto/testlib/selftests/expected_assert.lightxml
diff --git a/tests/auto/selftests/expected_assert.txt b/tests/auto/testlib/selftests/expected_assert.txt
index f57eb55604..f57eb55604 100644
--- a/tests/auto/selftests/expected_assert.txt
+++ b/tests/auto/testlib/selftests/expected_assert.txt
diff --git a/tests/auto/selftests/expected_assert.xml b/tests/auto/testlib/selftests/expected_assert.xml
index 60085aa2b9..60085aa2b9 100644
--- a/tests/auto/selftests/expected_assert.xml
+++ b/tests/auto/testlib/selftests/expected_assert.xml
diff --git a/tests/auto/selftests/expected_assert.xunitxml b/tests/auto/testlib/selftests/expected_assert.xunitxml
index 87617003c5..87617003c5 100644
--- a/tests/auto/selftests/expected_assert.xunitxml
+++ b/tests/auto/testlib/selftests/expected_assert.xunitxml
diff --git a/tests/auto/selftests/expected_badxml.lightxml b/tests/auto/testlib/selftests/expected_badxml.lightxml
index 19bec33e1e..19bec33e1e 100644
--- a/tests/auto/selftests/expected_badxml.lightxml
+++ b/tests/auto/testlib/selftests/expected_badxml.lightxml
diff --git a/tests/auto/selftests/expected_badxml.txt b/tests/auto/testlib/selftests/expected_badxml.txt
index bc9d203678..bc9d203678 100644
--- a/tests/auto/selftests/expected_badxml.txt
+++ b/tests/auto/testlib/selftests/expected_badxml.txt
diff --git a/tests/auto/selftests/expected_badxml.xml b/tests/auto/testlib/selftests/expected_badxml.xml
index a33c8d251e..a33c8d251e 100644
--- a/tests/auto/selftests/expected_badxml.xml
+++ b/tests/auto/testlib/selftests/expected_badxml.xml
diff --git a/tests/auto/selftests/expected_badxml.xunitxml b/tests/auto/testlib/selftests/expected_badxml.xunitxml
index 724aed59e7..724aed59e7 100644
--- a/tests/auto/selftests/expected_badxml.xunitxml
+++ b/tests/auto/testlib/selftests/expected_badxml.xunitxml
diff --git a/tests/auto/selftests/expected_benchlibcallgrind.lightxml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.lightxml
index c2394e545e..c2394e545e 100644
--- a/tests/auto/selftests/expected_benchlibcallgrind.lightxml
+++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.lightxml
diff --git a/tests/auto/selftests/expected_benchlibcallgrind.txt b/tests/auto/testlib/selftests/expected_benchlibcallgrind.txt
index f1727114b5..f1727114b5 100644
--- a/tests/auto/selftests/expected_benchlibcallgrind.txt
+++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.txt
diff --git a/tests/auto/selftests/expected_benchlibcallgrind.xml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.xml
index b29b9c569e..b29b9c569e 100644
--- a/tests/auto/selftests/expected_benchlibcallgrind.xml
+++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.xml
diff --git a/tests/auto/selftests/expected_benchlibcallgrind.xunitxml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.xunitxml
index cc58f7fdd4..cc58f7fdd4 100644
--- a/tests/auto/selftests/expected_benchlibcallgrind.xunitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.xunitxml
diff --git a/tests/auto/selftests/expected_benchlibeventcounter.lightxml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.lightxml
index 3bede6de83..3bede6de83 100644
--- a/tests/auto/selftests/expected_benchlibeventcounter.lightxml
+++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.lightxml
diff --git a/tests/auto/selftests/expected_benchlibeventcounter.txt b/tests/auto/testlib/selftests/expected_benchlibeventcounter.txt
index 906a4dea80..906a4dea80 100644
--- a/tests/auto/selftests/expected_benchlibeventcounter.txt
+++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.txt
diff --git a/tests/auto/selftests/expected_benchlibeventcounter.xml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.xml
index 646cf22b80..646cf22b80 100644
--- a/tests/auto/selftests/expected_benchlibeventcounter.xml
+++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.xml
diff --git a/tests/auto/selftests/expected_benchlibeventcounter.xunitxml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.xunitxml
index 60dca28d4f..60dca28d4f 100644
--- a/tests/auto/selftests/expected_benchlibeventcounter.xunitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.xunitxml
diff --git a/tests/auto/selftests/expected_benchliboptions.lightxml b/tests/auto/testlib/selftests/expected_benchliboptions.lightxml
index 63d0218b2c..63d0218b2c 100644
--- a/tests/auto/selftests/expected_benchliboptions.lightxml
+++ b/tests/auto/testlib/selftests/expected_benchliboptions.lightxml
diff --git a/tests/auto/selftests/expected_benchliboptions.txt b/tests/auto/testlib/selftests/expected_benchliboptions.txt
index 7afc922630..7afc922630 100644
--- a/tests/auto/selftests/expected_benchliboptions.txt
+++ b/tests/auto/testlib/selftests/expected_benchliboptions.txt
diff --git a/tests/auto/selftests/expected_benchliboptions.xml b/tests/auto/testlib/selftests/expected_benchliboptions.xml
index 40bff95f79..40bff95f79 100644
--- a/tests/auto/selftests/expected_benchliboptions.xml
+++ b/tests/auto/testlib/selftests/expected_benchliboptions.xml
diff --git a/tests/auto/selftests/expected_benchliboptions.xunitxml b/tests/auto/testlib/selftests/expected_benchliboptions.xunitxml
index 7317e90470..7317e90470 100644
--- a/tests/auto/selftests/expected_benchliboptions.xunitxml
+++ b/tests/auto/testlib/selftests/expected_benchliboptions.xunitxml
diff --git a/tests/auto/selftests/expected_benchlibtickcounter.lightxml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.lightxml
index 845fd9c161..845fd9c161 100644
--- a/tests/auto/selftests/expected_benchlibtickcounter.lightxml
+++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.lightxml
diff --git a/tests/auto/selftests/expected_benchlibtickcounter.txt b/tests/auto/testlib/selftests/expected_benchlibtickcounter.txt
index 4cdeeee906..4cdeeee906 100644
--- a/tests/auto/selftests/expected_benchlibtickcounter.txt
+++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.txt
diff --git a/tests/auto/selftests/expected_benchlibtickcounter.xml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.xml
index 3cd82a2b1a..3cd82a2b1a 100644
--- a/tests/auto/selftests/expected_benchlibtickcounter.xml
+++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.xml
diff --git a/tests/auto/selftests/expected_benchlibtickcounter.xunitxml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.xunitxml
index 28c8f11143..28c8f11143 100644
--- a/tests/auto/selftests/expected_benchlibtickcounter.xunitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.xunitxml
diff --git a/tests/auto/selftests/expected_benchlibwalltime.lightxml b/tests/auto/testlib/selftests/expected_benchlibwalltime.lightxml
index f1d89328ef..f1d89328ef 100644
--- a/tests/auto/selftests/expected_benchlibwalltime.lightxml
+++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.lightxml
diff --git a/tests/auto/selftests/expected_benchlibwalltime.txt b/tests/auto/testlib/selftests/expected_benchlibwalltime.txt
index ec2d020406..ec2d020406 100644
--- a/tests/auto/selftests/expected_benchlibwalltime.txt
+++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.txt
diff --git a/tests/auto/selftests/expected_benchlibwalltime.xml b/tests/auto/testlib/selftests/expected_benchlibwalltime.xml
index 1379d4bcc9..1379d4bcc9 100644
--- a/tests/auto/selftests/expected_benchlibwalltime.xml
+++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.xml
diff --git a/tests/auto/selftests/expected_benchlibwalltime.xunitxml b/tests/auto/testlib/selftests/expected_benchlibwalltime.xunitxml
index e4ffca4d09..e4ffca4d09 100644
--- a/tests/auto/selftests/expected_benchlibwalltime.xunitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.xunitxml
diff --git a/tests/auto/selftests/expected_cmptest.lightxml b/tests/auto/testlib/selftests/expected_cmptest.lightxml
index 72d1caf5f8..72d1caf5f8 100644
--- a/tests/auto/selftests/expected_cmptest.lightxml
+++ b/tests/auto/testlib/selftests/expected_cmptest.lightxml
diff --git a/tests/auto/selftests/expected_cmptest.txt b/tests/auto/testlib/selftests/expected_cmptest.txt
index df46703afa..df46703afa 100644
--- a/tests/auto/selftests/expected_cmptest.txt
+++ b/tests/auto/testlib/selftests/expected_cmptest.txt
diff --git a/tests/auto/selftests/expected_cmptest.xml b/tests/auto/testlib/selftests/expected_cmptest.xml
index 7064fcb1d0..7064fcb1d0 100644
--- a/tests/auto/selftests/expected_cmptest.xml
+++ b/tests/auto/testlib/selftests/expected_cmptest.xml
diff --git a/tests/auto/selftests/expected_cmptest.xunitxml b/tests/auto/testlib/selftests/expected_cmptest.xunitxml
index 01bfda8d01..01bfda8d01 100644
--- a/tests/auto/selftests/expected_cmptest.xunitxml
+++ b/tests/auto/testlib/selftests/expected_cmptest.xunitxml
diff --git a/tests/auto/selftests/expected_commandlinedata.lightxml b/tests/auto/testlib/selftests/expected_commandlinedata.lightxml
index 6907b7211f..6907b7211f 100644
--- a/tests/auto/selftests/expected_commandlinedata.lightxml
+++ b/tests/auto/testlib/selftests/expected_commandlinedata.lightxml
diff --git a/tests/auto/selftests/expected_commandlinedata.txt b/tests/auto/testlib/selftests/expected_commandlinedata.txt
index b79f491fe7..b79f491fe7 100644
--- a/tests/auto/selftests/expected_commandlinedata.txt
+++ b/tests/auto/testlib/selftests/expected_commandlinedata.txt
diff --git a/tests/auto/selftests/expected_commandlinedata.xml b/tests/auto/testlib/selftests/expected_commandlinedata.xml
index bcc8cbdbb7..bcc8cbdbb7 100644
--- a/tests/auto/selftests/expected_commandlinedata.xml
+++ b/tests/auto/testlib/selftests/expected_commandlinedata.xml
diff --git a/tests/auto/selftests/expected_commandlinedata.xunitxml b/tests/auto/testlib/selftests/expected_commandlinedata.xunitxml
index 45b833cf19..45b833cf19 100644
--- a/tests/auto/selftests/expected_commandlinedata.xunitxml
+++ b/tests/auto/testlib/selftests/expected_commandlinedata.xunitxml
diff --git a/tests/auto/selftests/expected_crashes.lightxml b/tests/auto/testlib/selftests/expected_crashes.lightxml
index 76890deb75..76890deb75 100644
--- a/tests/auto/selftests/expected_crashes.lightxml
+++ b/tests/auto/testlib/selftests/expected_crashes.lightxml
diff --git a/tests/auto/selftests/expected_crashes.xml b/tests/auto/testlib/selftests/expected_crashes.xml
index be01e633e9..be01e633e9 100644
--- a/tests/auto/selftests/expected_crashes.xml
+++ b/tests/auto/testlib/selftests/expected_crashes.xml
diff --git a/tests/auto/selftests/expected_crashes.xunitxml b/tests/auto/testlib/selftests/expected_crashes.xunitxml
index 558491c598..558491c598 100644
--- a/tests/auto/selftests/expected_crashes.xunitxml
+++ b/tests/auto/testlib/selftests/expected_crashes.xunitxml
diff --git a/tests/auto/selftests/expected_crashes_1.txt b/tests/auto/testlib/selftests/expected_crashes_1.txt
index 887a11713e..887a11713e 100644
--- a/tests/auto/selftests/expected_crashes_1.txt
+++ b/tests/auto/testlib/selftests/expected_crashes_1.txt
diff --git a/tests/auto/selftests/expected_crashes_2.txt b/tests/auto/testlib/selftests/expected_crashes_2.txt
index e5eb5aac6a..e5eb5aac6a 100644
--- a/tests/auto/selftests/expected_crashes_2.txt
+++ b/tests/auto/testlib/selftests/expected_crashes_2.txt
diff --git a/tests/auto/selftests/expected_crashes_3.txt b/tests/auto/testlib/selftests/expected_crashes_3.txt
index 1735aeba23..1735aeba23 100644
--- a/tests/auto/selftests/expected_crashes_3.txt
+++ b/tests/auto/testlib/selftests/expected_crashes_3.txt
diff --git a/tests/auto/selftests/expected_datatable.lightxml b/tests/auto/testlib/selftests/expected_datatable.lightxml
index e14d1e2abb..e14d1e2abb 100644
--- a/tests/auto/selftests/expected_datatable.lightxml
+++ b/tests/auto/testlib/selftests/expected_datatable.lightxml
diff --git a/tests/auto/selftests/expected_datatable.txt b/tests/auto/testlib/selftests/expected_datatable.txt
index 6fac9daff7..6fac9daff7 100644
--- a/tests/auto/selftests/expected_datatable.txt
+++ b/tests/auto/testlib/selftests/expected_datatable.txt
diff --git a/tests/auto/selftests/expected_datatable.xml b/tests/auto/testlib/selftests/expected_datatable.xml
index 0d12594a09..0d12594a09 100644
--- a/tests/auto/selftests/expected_datatable.xml
+++ b/tests/auto/testlib/selftests/expected_datatable.xml
diff --git a/tests/auto/selftests/expected_datatable.xunitxml b/tests/auto/testlib/selftests/expected_datatable.xunitxml
index 6bac80e0a2..6bac80e0a2 100644
--- a/tests/auto/selftests/expected_datatable.xunitxml
+++ b/tests/auto/testlib/selftests/expected_datatable.xunitxml
diff --git a/tests/auto/selftests/expected_datetime.lightxml b/tests/auto/testlib/selftests/expected_datetime.lightxml
index 49f8546e6a..49f8546e6a 100644
--- a/tests/auto/selftests/expected_datetime.lightxml
+++ b/tests/auto/testlib/selftests/expected_datetime.lightxml
diff --git a/tests/auto/selftests/expected_datetime.txt b/tests/auto/testlib/selftests/expected_datetime.txt
index d745aa04f5..d745aa04f5 100644
--- a/tests/auto/selftests/expected_datetime.txt
+++ b/tests/auto/testlib/selftests/expected_datetime.txt
diff --git a/tests/auto/selftests/expected_datetime.xml b/tests/auto/testlib/selftests/expected_datetime.xml
index b7b870e678..b7b870e678 100644
--- a/tests/auto/selftests/expected_datetime.xml
+++ b/tests/auto/testlib/selftests/expected_datetime.xml
diff --git a/tests/auto/selftests/expected_datetime.xunitxml b/tests/auto/testlib/selftests/expected_datetime.xunitxml
index b30d1c441f..b30d1c441f 100644
--- a/tests/auto/selftests/expected_datetime.xunitxml
+++ b/tests/auto/testlib/selftests/expected_datetime.xunitxml
diff --git a/tests/auto/selftests/expected_differentexec.txt b/tests/auto/testlib/selftests/expected_differentexec.txt
index 9536b69c87..9536b69c87 100644
--- a/tests/auto/selftests/expected_differentexec.txt
+++ b/tests/auto/testlib/selftests/expected_differentexec.txt
diff --git a/tests/auto/selftests/expected_exceptionthrow.lightxml b/tests/auto/testlib/selftests/expected_exceptionthrow.lightxml
index 0b8de0a6ba..0b8de0a6ba 100644
--- a/tests/auto/selftests/expected_exceptionthrow.lightxml
+++ b/tests/auto/testlib/selftests/expected_exceptionthrow.lightxml
diff --git a/tests/auto/selftests/expected_exceptionthrow.txt b/tests/auto/testlib/selftests/expected_exceptionthrow.txt
index 141ea8be77..141ea8be77 100644
--- a/tests/auto/selftests/expected_exceptionthrow.txt
+++ b/tests/auto/testlib/selftests/expected_exceptionthrow.txt
diff --git a/tests/auto/selftests/expected_exceptionthrow.xml b/tests/auto/testlib/selftests/expected_exceptionthrow.xml
index bddbb7d7b6..bddbb7d7b6 100644
--- a/tests/auto/selftests/expected_exceptionthrow.xml
+++ b/tests/auto/testlib/selftests/expected_exceptionthrow.xml
diff --git a/tests/auto/selftests/expected_exceptionthrow.xunitxml b/tests/auto/testlib/selftests/expected_exceptionthrow.xunitxml
index ab0d379255..ab0d379255 100644
--- a/tests/auto/selftests/expected_exceptionthrow.xunitxml
+++ b/tests/auto/testlib/selftests/expected_exceptionthrow.xunitxml
diff --git a/tests/auto/selftests/expected_expectfail.lightxml b/tests/auto/testlib/selftests/expected_expectfail.lightxml
index 003b8e866d..003b8e866d 100644
--- a/tests/auto/selftests/expected_expectfail.lightxml
+++ b/tests/auto/testlib/selftests/expected_expectfail.lightxml
diff --git a/tests/auto/selftests/expected_expectfail.txt b/tests/auto/testlib/selftests/expected_expectfail.txt
index 2eee7ffd75..2eee7ffd75 100644
--- a/tests/auto/selftests/expected_expectfail.txt
+++ b/tests/auto/testlib/selftests/expected_expectfail.txt
diff --git a/tests/auto/selftests/expected_expectfail.xml b/tests/auto/testlib/selftests/expected_expectfail.xml
index 670467eb07..670467eb07 100644
--- a/tests/auto/selftests/expected_expectfail.xml
+++ b/tests/auto/testlib/selftests/expected_expectfail.xml
diff --git a/tests/auto/selftests/expected_expectfail.xunitxml b/tests/auto/testlib/selftests/expected_expectfail.xunitxml
index 32a5cfca81..32a5cfca81 100644
--- a/tests/auto/selftests/expected_expectfail.xunitxml
+++ b/tests/auto/testlib/selftests/expected_expectfail.xunitxml
diff --git a/tests/auto/selftests/expected_failinit.lightxml b/tests/auto/testlib/selftests/expected_failinit.lightxml
index 0edf225bf1..0edf225bf1 100644
--- a/tests/auto/selftests/expected_failinit.lightxml
+++ b/tests/auto/testlib/selftests/expected_failinit.lightxml
diff --git a/tests/auto/selftests/expected_failinit.txt b/tests/auto/testlib/selftests/expected_failinit.txt
index 6f848988de..6f848988de 100644
--- a/tests/auto/selftests/expected_failinit.txt
+++ b/tests/auto/testlib/selftests/expected_failinit.txt
diff --git a/tests/auto/selftests/expected_failinit.xml b/tests/auto/testlib/selftests/expected_failinit.xml
index e1f9e8d069..e1f9e8d069 100644
--- a/tests/auto/selftests/expected_failinit.xml
+++ b/tests/auto/testlib/selftests/expected_failinit.xml
diff --git a/tests/auto/selftests/expected_failinit.xunitxml b/tests/auto/testlib/selftests/expected_failinit.xunitxml
index 3c2e31be29..3c2e31be29 100644
--- a/tests/auto/selftests/expected_failinit.xunitxml
+++ b/tests/auto/testlib/selftests/expected_failinit.xunitxml
diff --git a/tests/auto/selftests/expected_failinitdata.lightxml b/tests/auto/testlib/selftests/expected_failinitdata.lightxml
index 56d8c71ba6..56d8c71ba6 100644
--- a/tests/auto/selftests/expected_failinitdata.lightxml
+++ b/tests/auto/testlib/selftests/expected_failinitdata.lightxml
diff --git a/tests/auto/selftests/expected_failinitdata.txt b/tests/auto/testlib/selftests/expected_failinitdata.txt
index c74308f7af..c74308f7af 100644
--- a/tests/auto/selftests/expected_failinitdata.txt
+++ b/tests/auto/testlib/selftests/expected_failinitdata.txt
diff --git a/tests/auto/selftests/expected_failinitdata.xml b/tests/auto/testlib/selftests/expected_failinitdata.xml
index 47be1b6726..47be1b6726 100644
--- a/tests/auto/selftests/expected_failinitdata.xml
+++ b/tests/auto/testlib/selftests/expected_failinitdata.xml
diff --git a/tests/auto/selftests/expected_failinitdata.xunitxml b/tests/auto/testlib/selftests/expected_failinitdata.xunitxml
index f32ccd5e81..f32ccd5e81 100644
--- a/tests/auto/selftests/expected_failinitdata.xunitxml
+++ b/tests/auto/testlib/selftests/expected_failinitdata.xunitxml
diff --git a/tests/auto/selftests/expected_fatal.txt b/tests/auto/testlib/selftests/expected_fatal.txt
index c8ab3d6ee3..c8ab3d6ee3 100644
--- a/tests/auto/selftests/expected_fatal.txt
+++ b/tests/auto/testlib/selftests/expected_fatal.txt
diff --git a/tests/auto/selftests/expected_fetchbogus.lightxml b/tests/auto/testlib/selftests/expected_fetchbogus.lightxml
index 1812c0e6b5..1812c0e6b5 100644
--- a/tests/auto/selftests/expected_fetchbogus.lightxml
+++ b/tests/auto/testlib/selftests/expected_fetchbogus.lightxml
diff --git a/tests/auto/selftests/expected_fetchbogus.txt b/tests/auto/testlib/selftests/expected_fetchbogus.txt
index 22f8d1beca..22f8d1beca 100644
--- a/tests/auto/selftests/expected_fetchbogus.txt
+++ b/tests/auto/testlib/selftests/expected_fetchbogus.txt
diff --git a/tests/auto/selftests/expected_fetchbogus.xml b/tests/auto/testlib/selftests/expected_fetchbogus.xml
index 7daa065e3d..7daa065e3d 100644
--- a/tests/auto/selftests/expected_fetchbogus.xml
+++ b/tests/auto/testlib/selftests/expected_fetchbogus.xml
diff --git a/tests/auto/selftests/expected_fetchbogus.xunitxml b/tests/auto/testlib/selftests/expected_fetchbogus.xunitxml
index fe31b4b600..fe31b4b600 100644
--- a/tests/auto/selftests/expected_fetchbogus.xunitxml
+++ b/tests/auto/testlib/selftests/expected_fetchbogus.xunitxml
diff --git a/tests/auto/selftests/expected_globaldata.lightxml b/tests/auto/testlib/selftests/expected_globaldata.lightxml
index c4db4bc90c..c4db4bc90c 100644
--- a/tests/auto/selftests/expected_globaldata.lightxml
+++ b/tests/auto/testlib/selftests/expected_globaldata.lightxml
diff --git a/tests/auto/selftests/expected_globaldata.txt b/tests/auto/testlib/selftests/expected_globaldata.txt
index 983376b261..983376b261 100644
--- a/tests/auto/selftests/expected_globaldata.txt
+++ b/tests/auto/testlib/selftests/expected_globaldata.txt
diff --git a/tests/auto/selftests/expected_globaldata.xml b/tests/auto/testlib/selftests/expected_globaldata.xml
index ea4beb1886..ea4beb1886 100644
--- a/tests/auto/selftests/expected_globaldata.xml
+++ b/tests/auto/testlib/selftests/expected_globaldata.xml
diff --git a/tests/auto/selftests/expected_globaldata.xunitxml b/tests/auto/testlib/selftests/expected_globaldata.xunitxml
index d88fdbffa6..d88fdbffa6 100644
--- a/tests/auto/selftests/expected_globaldata.xunitxml
+++ b/tests/auto/testlib/selftests/expected_globaldata.xunitxml
diff --git a/tests/auto/selftests/expected_longstring.lightxml b/tests/auto/testlib/selftests/expected_longstring.lightxml
index 945a9f3d94..945a9f3d94 100644
--- a/tests/auto/selftests/expected_longstring.lightxml
+++ b/tests/auto/testlib/selftests/expected_longstring.lightxml
diff --git a/tests/auto/selftests/expected_longstring.txt b/tests/auto/testlib/selftests/expected_longstring.txt
index 443c6572b0..443c6572b0 100644
--- a/tests/auto/selftests/expected_longstring.txt
+++ b/tests/auto/testlib/selftests/expected_longstring.txt
diff --git a/tests/auto/selftests/expected_longstring.xml b/tests/auto/testlib/selftests/expected_longstring.xml
index 45ad2862fd..45ad2862fd 100644
--- a/tests/auto/selftests/expected_longstring.xml
+++ b/tests/auto/testlib/selftests/expected_longstring.xml
diff --git a/tests/auto/selftests/expected_longstring.xunitxml b/tests/auto/testlib/selftests/expected_longstring.xunitxml
index 6486817dbb..6486817dbb 100644
--- a/tests/auto/selftests/expected_longstring.xunitxml
+++ b/tests/auto/testlib/selftests/expected_longstring.xunitxml
diff --git a/tests/auto/selftests/expected_maxwarnings.lightxml b/tests/auto/testlib/selftests/expected_maxwarnings.lightxml
index 054108fe6d..054108fe6d 100644
--- a/tests/auto/selftests/expected_maxwarnings.lightxml
+++ b/tests/auto/testlib/selftests/expected_maxwarnings.lightxml
diff --git a/tests/auto/selftests/expected_maxwarnings.txt b/tests/auto/testlib/selftests/expected_maxwarnings.txt
index 901350b741..901350b741 100644
--- a/tests/auto/selftests/expected_maxwarnings.txt
+++ b/tests/auto/testlib/selftests/expected_maxwarnings.txt
diff --git a/tests/auto/selftests/expected_maxwarnings.xml b/tests/auto/testlib/selftests/expected_maxwarnings.xml
index 2c3736e263..2c3736e263 100644
--- a/tests/auto/selftests/expected_maxwarnings.xml
+++ b/tests/auto/testlib/selftests/expected_maxwarnings.xml
diff --git a/tests/auto/selftests/expected_maxwarnings.xunitxml b/tests/auto/testlib/selftests/expected_maxwarnings.xunitxml
index b1b0215cef..b1b0215cef 100644
--- a/tests/auto/selftests/expected_maxwarnings.xunitxml
+++ b/tests/auto/testlib/selftests/expected_maxwarnings.xunitxml
diff --git a/tests/auto/selftests/expected_multiexec.lightxml b/tests/auto/testlib/selftests/expected_multiexec.lightxml
index 1a66e92f8f..1a66e92f8f 100644
--- a/tests/auto/selftests/expected_multiexec.lightxml
+++ b/tests/auto/testlib/selftests/expected_multiexec.lightxml
diff --git a/tests/auto/selftests/expected_multiexec.txt b/tests/auto/testlib/selftests/expected_multiexec.txt
index 11d7a909a2..11d7a909a2 100644
--- a/tests/auto/selftests/expected_multiexec.txt
+++ b/tests/auto/testlib/selftests/expected_multiexec.txt
diff --git a/tests/auto/selftests/expected_multiexec.xml b/tests/auto/testlib/selftests/expected_multiexec.xml
index 7f71f6edac..7f71f6edac 100644
--- a/tests/auto/selftests/expected_multiexec.xml
+++ b/tests/auto/testlib/selftests/expected_multiexec.xml
diff --git a/tests/auto/selftests/expected_multiexec.xunitxml b/tests/auto/testlib/selftests/expected_multiexec.xunitxml
index 6bc04c3ddd..6bc04c3ddd 100644
--- a/tests/auto/selftests/expected_multiexec.xunitxml
+++ b/tests/auto/testlib/selftests/expected_multiexec.xunitxml
diff --git a/tests/auto/selftests/expected_qexecstringlist.txt b/tests/auto/testlib/selftests/expected_qexecstringlist.txt
index e6c8f00ae3..e6c8f00ae3 100644
--- a/tests/auto/selftests/expected_qexecstringlist.txt
+++ b/tests/auto/testlib/selftests/expected_qexecstringlist.txt
diff --git a/tests/auto/selftests/expected_singleskip.lightxml b/tests/auto/testlib/selftests/expected_singleskip.lightxml
index bcddcae004..bcddcae004 100644
--- a/tests/auto/selftests/expected_singleskip.lightxml
+++ b/tests/auto/testlib/selftests/expected_singleskip.lightxml
diff --git a/tests/auto/selftests/expected_singleskip.txt b/tests/auto/testlib/selftests/expected_singleskip.txt
index 19cb797dba..19cb797dba 100644
--- a/tests/auto/selftests/expected_singleskip.txt
+++ b/tests/auto/testlib/selftests/expected_singleskip.txt
diff --git a/tests/auto/selftests/expected_singleskip.xml b/tests/auto/testlib/selftests/expected_singleskip.xml
index 483863ec91..483863ec91 100644
--- a/tests/auto/selftests/expected_singleskip.xml
+++ b/tests/auto/testlib/selftests/expected_singleskip.xml
diff --git a/tests/auto/selftests/expected_singleskip.xunitxml b/tests/auto/testlib/selftests/expected_singleskip.xunitxml
index 70968fa1c4..70968fa1c4 100644
--- a/tests/auto/selftests/expected_singleskip.xunitxml
+++ b/tests/auto/testlib/selftests/expected_singleskip.xunitxml
diff --git a/tests/auto/selftests/expected_skip.lightxml b/tests/auto/testlib/selftests/expected_skip.lightxml
index 61cfe7db72..61cfe7db72 100644
--- a/tests/auto/selftests/expected_skip.lightxml
+++ b/tests/auto/testlib/selftests/expected_skip.lightxml
diff --git a/tests/auto/selftests/expected_skip.txt b/tests/auto/testlib/selftests/expected_skip.txt
index 42f89a7cda..42f89a7cda 100644
--- a/tests/auto/selftests/expected_skip.txt
+++ b/tests/auto/testlib/selftests/expected_skip.txt
diff --git a/tests/auto/selftests/expected_skip.xml b/tests/auto/testlib/selftests/expected_skip.xml
index 3c7b1073c8..3c7b1073c8 100644
--- a/tests/auto/selftests/expected_skip.xml
+++ b/tests/auto/testlib/selftests/expected_skip.xml
diff --git a/tests/auto/selftests/expected_skip.xunitxml b/tests/auto/testlib/selftests/expected_skip.xunitxml
index 956d51f531..956d51f531 100644
--- a/tests/auto/selftests/expected_skip.xunitxml
+++ b/tests/auto/testlib/selftests/expected_skip.xunitxml
diff --git a/tests/auto/selftests/expected_skipglobal.lightxml b/tests/auto/testlib/selftests/expected_skipglobal.lightxml
index 66084fc1e8..66084fc1e8 100644
--- a/tests/auto/selftests/expected_skipglobal.lightxml
+++ b/tests/auto/testlib/selftests/expected_skipglobal.lightxml
diff --git a/tests/auto/selftests/expected_skipglobal.txt b/tests/auto/testlib/selftests/expected_skipglobal.txt
index dcd6c442dc..dcd6c442dc 100644
--- a/tests/auto/selftests/expected_skipglobal.txt
+++ b/tests/auto/testlib/selftests/expected_skipglobal.txt
diff --git a/tests/auto/selftests/expected_skipglobal.xml b/tests/auto/testlib/selftests/expected_skipglobal.xml
index 4d25bc9460..4d25bc9460 100644
--- a/tests/auto/selftests/expected_skipglobal.xml
+++ b/tests/auto/testlib/selftests/expected_skipglobal.xml
diff --git a/tests/auto/selftests/expected_skipglobal.xunitxml b/tests/auto/testlib/selftests/expected_skipglobal.xunitxml
index cc43ec8614..cc43ec8614 100644
--- a/tests/auto/selftests/expected_skipglobal.xunitxml
+++ b/tests/auto/testlib/selftests/expected_skipglobal.xunitxml
diff --git a/tests/auto/selftests/expected_skipinit.lightxml b/tests/auto/testlib/selftests/expected_skipinit.lightxml
index 005169e7e6..005169e7e6 100644
--- a/tests/auto/selftests/expected_skipinit.lightxml
+++ b/tests/auto/testlib/selftests/expected_skipinit.lightxml
diff --git a/tests/auto/selftests/expected_skipinit.txt b/tests/auto/testlib/selftests/expected_skipinit.txt
index a1567859bb..a1567859bb 100644
--- a/tests/auto/selftests/expected_skipinit.txt
+++ b/tests/auto/testlib/selftests/expected_skipinit.txt
diff --git a/tests/auto/selftests/expected_skipinit.xml b/tests/auto/testlib/selftests/expected_skipinit.xml
index 5118fd1cb0..5118fd1cb0 100644
--- a/tests/auto/selftests/expected_skipinit.xml
+++ b/tests/auto/testlib/selftests/expected_skipinit.xml
diff --git a/tests/auto/selftests/expected_skipinit.xunitxml b/tests/auto/testlib/selftests/expected_skipinit.xunitxml
index f62df71d96..f62df71d96 100644
--- a/tests/auto/selftests/expected_skipinit.xunitxml
+++ b/tests/auto/testlib/selftests/expected_skipinit.xunitxml
diff --git a/tests/auto/selftests/expected_skipinitdata.lightxml b/tests/auto/testlib/selftests/expected_skipinitdata.lightxml
index bac851ec25..bac851ec25 100644
--- a/tests/auto/selftests/expected_skipinitdata.lightxml
+++ b/tests/auto/testlib/selftests/expected_skipinitdata.lightxml
diff --git a/tests/auto/selftests/expected_skipinitdata.txt b/tests/auto/testlib/selftests/expected_skipinitdata.txt
index 11ca438f3a..11ca438f3a 100644
--- a/tests/auto/selftests/expected_skipinitdata.txt
+++ b/tests/auto/testlib/selftests/expected_skipinitdata.txt
diff --git a/tests/auto/selftests/expected_skipinitdata.xml b/tests/auto/testlib/selftests/expected_skipinitdata.xml
index 05e57b1ab3..05e57b1ab3 100644
--- a/tests/auto/selftests/expected_skipinitdata.xml
+++ b/tests/auto/testlib/selftests/expected_skipinitdata.xml
diff --git a/tests/auto/selftests/expected_skipinitdata.xunitxml b/tests/auto/testlib/selftests/expected_skipinitdata.xunitxml
index 93967eb055..93967eb055 100644
--- a/tests/auto/selftests/expected_skipinitdata.xunitxml
+++ b/tests/auto/testlib/selftests/expected_skipinitdata.xunitxml
diff --git a/tests/auto/selftests/expected_sleep.lightxml b/tests/auto/testlib/selftests/expected_sleep.lightxml
index 1a056c8562..1a056c8562 100644
--- a/tests/auto/selftests/expected_sleep.lightxml
+++ b/tests/auto/testlib/selftests/expected_sleep.lightxml
diff --git a/tests/auto/selftests/expected_sleep.txt b/tests/auto/testlib/selftests/expected_sleep.txt
index 67f1f2f659..67f1f2f659 100644
--- a/tests/auto/selftests/expected_sleep.txt
+++ b/tests/auto/testlib/selftests/expected_sleep.txt
diff --git a/tests/auto/selftests/expected_sleep.xml b/tests/auto/testlib/selftests/expected_sleep.xml
index cbc4d14004..cbc4d14004 100644
--- a/tests/auto/selftests/expected_sleep.xml
+++ b/tests/auto/testlib/selftests/expected_sleep.xml
diff --git a/tests/auto/selftests/expected_sleep.xunitxml b/tests/auto/testlib/selftests/expected_sleep.xunitxml
index 409621e6bc..409621e6bc 100644
--- a/tests/auto/selftests/expected_sleep.xunitxml
+++ b/tests/auto/testlib/selftests/expected_sleep.xunitxml
diff --git a/tests/auto/selftests/expected_strcmp.lightxml b/tests/auto/testlib/selftests/expected_strcmp.lightxml
index 28dc9335ec..28dc9335ec 100644
--- a/tests/auto/selftests/expected_strcmp.lightxml
+++ b/tests/auto/testlib/selftests/expected_strcmp.lightxml
diff --git a/tests/auto/selftests/expected_strcmp.txt b/tests/auto/testlib/selftests/expected_strcmp.txt
index c739d94943..c739d94943 100644
--- a/tests/auto/selftests/expected_strcmp.txt
+++ b/tests/auto/testlib/selftests/expected_strcmp.txt
diff --git a/tests/auto/selftests/expected_strcmp.xml b/tests/auto/testlib/selftests/expected_strcmp.xml
index 13fe772431..13fe772431 100644
--- a/tests/auto/selftests/expected_strcmp.xml
+++ b/tests/auto/testlib/selftests/expected_strcmp.xml
diff --git a/tests/auto/selftests/expected_strcmp.xunitxml b/tests/auto/testlib/selftests/expected_strcmp.xunitxml
index c2b694b8bb..c2b694b8bb 100644
--- a/tests/auto/selftests/expected_strcmp.xunitxml
+++ b/tests/auto/testlib/selftests/expected_strcmp.xunitxml
diff --git a/tests/auto/selftests/expected_subtest.lightxml b/tests/auto/testlib/selftests/expected_subtest.lightxml
index 00c1a992bd..00c1a992bd 100644
--- a/tests/auto/selftests/expected_subtest.lightxml
+++ b/tests/auto/testlib/selftests/expected_subtest.lightxml
diff --git a/tests/auto/selftests/expected_subtest.txt b/tests/auto/testlib/selftests/expected_subtest.txt
index ec459c5b59..ec459c5b59 100644
--- a/tests/auto/selftests/expected_subtest.txt
+++ b/tests/auto/testlib/selftests/expected_subtest.txt
diff --git a/tests/auto/selftests/expected_subtest.xml b/tests/auto/testlib/selftests/expected_subtest.xml
index 5ecb0a2e9f..5ecb0a2e9f 100644
--- a/tests/auto/selftests/expected_subtest.xml
+++ b/tests/auto/testlib/selftests/expected_subtest.xml
diff --git a/tests/auto/selftests/expected_subtest.xunitxml b/tests/auto/testlib/selftests/expected_subtest.xunitxml
index a5f75fe73e..a5f75fe73e 100644
--- a/tests/auto/selftests/expected_subtest.xunitxml
+++ b/tests/auto/testlib/selftests/expected_subtest.xunitxml
diff --git a/tests/auto/selftests/expected_waitwithoutgui.lightxml b/tests/auto/testlib/selftests/expected_waitwithoutgui.lightxml
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/selftests/expected_waitwithoutgui.lightxml
+++ b/tests/auto/testlib/selftests/expected_waitwithoutgui.lightxml
diff --git a/tests/auto/selftests/expected_waitwithoutgui.txt b/tests/auto/testlib/selftests/expected_waitwithoutgui.txt
index a1691071a0..a1691071a0 100644
--- a/tests/auto/selftests/expected_waitwithoutgui.txt
+++ b/tests/auto/testlib/selftests/expected_waitwithoutgui.txt
diff --git a/tests/auto/selftests/expected_waitwithoutgui.xml b/tests/auto/testlib/selftests/expected_waitwithoutgui.xml
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/selftests/expected_waitwithoutgui.xml
+++ b/tests/auto/testlib/selftests/expected_waitwithoutgui.xml
diff --git a/tests/auto/selftests/expected_waitwithoutgui.xunitxml b/tests/auto/testlib/selftests/expected_waitwithoutgui.xunitxml
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/selftests/expected_waitwithoutgui.xunitxml
+++ b/tests/auto/testlib/selftests/expected_waitwithoutgui.xunitxml
diff --git a/tests/auto/selftests/expected_warnings.lightxml b/tests/auto/testlib/selftests/expected_warnings.lightxml
index 116156ed8a..116156ed8a 100644
--- a/tests/auto/selftests/expected_warnings.lightxml
+++ b/tests/auto/testlib/selftests/expected_warnings.lightxml
diff --git a/tests/auto/selftests/expected_warnings.txt b/tests/auto/testlib/selftests/expected_warnings.txt
index 0a9437f47c..0a9437f47c 100644
--- a/tests/auto/selftests/expected_warnings.txt
+++ b/tests/auto/testlib/selftests/expected_warnings.txt
diff --git a/tests/auto/selftests/expected_warnings.xml b/tests/auto/testlib/selftests/expected_warnings.xml
index 13e6c1df79..13e6c1df79 100644
--- a/tests/auto/selftests/expected_warnings.xml
+++ b/tests/auto/testlib/selftests/expected_warnings.xml
diff --git a/tests/auto/selftests/expected_warnings.xunitxml b/tests/auto/testlib/selftests/expected_warnings.xunitxml
index a96393d648..a96393d648 100644
--- a/tests/auto/selftests/expected_warnings.xunitxml
+++ b/tests/auto/testlib/selftests/expected_warnings.xunitxml
diff --git a/tests/auto/selftests/expected_xunit.lightxml b/tests/auto/testlib/selftests/expected_xunit.lightxml
index 92772015c8..92772015c8 100644
--- a/tests/auto/selftests/expected_xunit.lightxml
+++ b/tests/auto/testlib/selftests/expected_xunit.lightxml
diff --git a/tests/auto/selftests/expected_xunit.txt b/tests/auto/testlib/selftests/expected_xunit.txt
index ac8c0dba23..ac8c0dba23 100644
--- a/tests/auto/selftests/expected_xunit.txt
+++ b/tests/auto/testlib/selftests/expected_xunit.txt
diff --git a/tests/auto/selftests/expected_xunit.xml b/tests/auto/testlib/selftests/expected_xunit.xml
index 8992f49993..8992f49993 100644
--- a/tests/auto/selftests/expected_xunit.xml
+++ b/tests/auto/testlib/selftests/expected_xunit.xml
diff --git a/tests/auto/selftests/expected_xunit.xunitxml b/tests/auto/testlib/selftests/expected_xunit.xunitxml
index e77004f819..e77004f819 100644
--- a/tests/auto/selftests/expected_xunit.xunitxml
+++ b/tests/auto/testlib/selftests/expected_xunit.xunitxml
diff --git a/tests/auto/selftests/expectfail/expectfail.pro b/tests/auto/testlib/selftests/expectfail/expectfail.pro
index 1e96018825..1e96018825 100644
--- a/tests/auto/selftests/expectfail/expectfail.pro
+++ b/tests/auto/testlib/selftests/expectfail/expectfail.pro
diff --git a/tests/auto/selftests/expectfail/tst_expectfail.cpp b/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
index 04aef02cc7..04aef02cc7 100644
--- a/tests/auto/selftests/expectfail/tst_expectfail.cpp
+++ b/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
diff --git a/tests/auto/selftests/failinit/failinit.pro b/tests/auto/testlib/selftests/failinit/failinit.pro
index 0eedd06427..0eedd06427 100644
--- a/tests/auto/selftests/failinit/failinit.pro
+++ b/tests/auto/testlib/selftests/failinit/failinit.pro
diff --git a/tests/auto/selftests/failinit/tst_failinit.cpp b/tests/auto/testlib/selftests/failinit/tst_failinit.cpp
index 0bf448f428..0bf448f428 100644
--- a/tests/auto/selftests/failinit/tst_failinit.cpp
+++ b/tests/auto/testlib/selftests/failinit/tst_failinit.cpp
diff --git a/tests/auto/selftests/failinitdata/failinitdata.pro b/tests/auto/testlib/selftests/failinitdata/failinitdata.pro
index 61f393771b..61f393771b 100644
--- a/tests/auto/selftests/failinitdata/failinitdata.pro
+++ b/tests/auto/testlib/selftests/failinitdata/failinitdata.pro
diff --git a/tests/auto/selftests/failinitdata/tst_failinitdata.cpp b/tests/auto/testlib/selftests/failinitdata/tst_failinitdata.cpp
index 00e4d12256..00e4d12256 100644
--- a/tests/auto/selftests/failinitdata/tst_failinitdata.cpp
+++ b/tests/auto/testlib/selftests/failinitdata/tst_failinitdata.cpp
diff --git a/tests/auto/selftests/fetchbogus/fetchbogus.pro b/tests/auto/testlib/selftests/fetchbogus/fetchbogus.pro
index 9a5e095d0c..9a5e095d0c 100644
--- a/tests/auto/selftests/fetchbogus/fetchbogus.pro
+++ b/tests/auto/testlib/selftests/fetchbogus/fetchbogus.pro
diff --git a/tests/auto/selftests/fetchbogus/tst_fetchbogus.cpp b/tests/auto/testlib/selftests/fetchbogus/tst_fetchbogus.cpp
index 65d10c180c..65d10c180c 100644
--- a/tests/auto/selftests/fetchbogus/tst_fetchbogus.cpp
+++ b/tests/auto/testlib/selftests/fetchbogus/tst_fetchbogus.cpp
diff --git a/tests/auto/selftests/globaldata/globaldata.pro b/tests/auto/testlib/selftests/globaldata/globaldata.pro
index 71a243f680..71a243f680 100644
--- a/tests/auto/selftests/globaldata/globaldata.pro
+++ b/tests/auto/testlib/selftests/globaldata/globaldata.pro
diff --git a/tests/auto/selftests/globaldata/tst_globaldata.cpp b/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp
index 296f4d674a..296f4d674a 100644
--- a/tests/auto/selftests/globaldata/tst_globaldata.cpp
+++ b/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp
diff --git a/tests/auto/selftests/longstring/longstring.pro b/tests/auto/testlib/selftests/longstring/longstring.pro
index d496691e60..d496691e60 100644
--- a/tests/auto/selftests/longstring/longstring.pro
+++ b/tests/auto/testlib/selftests/longstring/longstring.pro
diff --git a/tests/auto/selftests/longstring/tst_longstring.cpp b/tests/auto/testlib/selftests/longstring/tst_longstring.cpp
index 99dac95ba1..99dac95ba1 100644
--- a/tests/auto/selftests/longstring/tst_longstring.cpp
+++ b/tests/auto/testlib/selftests/longstring/tst_longstring.cpp
diff --git a/tests/auto/selftests/maxwarnings/maxwarnings.cpp b/tests/auto/testlib/selftests/maxwarnings/maxwarnings.cpp
index 398d0d8e4a..398d0d8e4a 100644
--- a/tests/auto/selftests/maxwarnings/maxwarnings.cpp
+++ b/tests/auto/testlib/selftests/maxwarnings/maxwarnings.cpp
diff --git a/tests/auto/selftests/maxwarnings/maxwarnings.pro b/tests/auto/testlib/selftests/maxwarnings/maxwarnings.pro
index 42a122d02a..42a122d02a 100644
--- a/tests/auto/selftests/maxwarnings/maxwarnings.pro
+++ b/tests/auto/testlib/selftests/maxwarnings/maxwarnings.pro
diff --git a/tests/auto/selftests/multiexec/multiexec.pro b/tests/auto/testlib/selftests/multiexec/multiexec.pro
index 5a3f5affaf..5a3f5affaf 100644
--- a/tests/auto/selftests/multiexec/multiexec.pro
+++ b/tests/auto/testlib/selftests/multiexec/multiexec.pro
diff --git a/tests/auto/selftests/multiexec/tst_multiexec.cpp b/tests/auto/testlib/selftests/multiexec/tst_multiexec.cpp
index 0480714c77..0480714c77 100644
--- a/tests/auto/selftests/multiexec/tst_multiexec.cpp
+++ b/tests/auto/testlib/selftests/multiexec/tst_multiexec.cpp
diff --git a/tests/auto/selftests/qexecstringlist/qexecstringlist.pro b/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro
index d994ceabf3..d994ceabf3 100644
--- a/tests/auto/selftests/qexecstringlist/qexecstringlist.pro
+++ b/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro
diff --git a/tests/auto/selftests/qexecstringlist/tst_qexecstringlist.cpp b/tests/auto/testlib/selftests/qexecstringlist/tst_qexecstringlist.cpp
index aacfab76f1..aacfab76f1 100644
--- a/tests/auto/selftests/qexecstringlist/tst_qexecstringlist.cpp
+++ b/tests/auto/testlib/selftests/qexecstringlist/tst_qexecstringlist.cpp
diff --git a/tests/auto/selftests/selftests.pro b/tests/auto/testlib/selftests/selftests.pro
index 2f1c327e34..2f1c327e34 100644
--- a/tests/auto/selftests/selftests.pro
+++ b/tests/auto/testlib/selftests/selftests.pro
diff --git a/tests/auto/selftests/selftests.qrc b/tests/auto/testlib/selftests/selftests.qrc
index f82722b0e2..f82722b0e2 100644
--- a/tests/auto/selftests/selftests.qrc
+++ b/tests/auto/testlib/selftests/selftests.qrc
diff --git a/tests/auto/selftests/singleskip/singleskip.pro b/tests/auto/testlib/selftests/singleskip/singleskip.pro
index 34a0f72568..34a0f72568 100644
--- a/tests/auto/selftests/singleskip/singleskip.pro
+++ b/tests/auto/testlib/selftests/singleskip/singleskip.pro
diff --git a/tests/auto/selftests/singleskip/tst_singleskip.cpp b/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp
index 5567b88022..5567b88022 100644
--- a/tests/auto/selftests/singleskip/tst_singleskip.cpp
+++ b/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp
diff --git a/tests/auto/selftests/skip/skip.pro b/tests/auto/testlib/selftests/skip/skip.pro
index 4f4b486ed4..4f4b486ed4 100644
--- a/tests/auto/selftests/skip/skip.pro
+++ b/tests/auto/testlib/selftests/skip/skip.pro
diff --git a/tests/auto/selftests/skip/tst_skip.cpp b/tests/auto/testlib/selftests/skip/tst_skip.cpp
index b5b53884b7..b5b53884b7 100644
--- a/tests/auto/selftests/skip/tst_skip.cpp
+++ b/tests/auto/testlib/selftests/skip/tst_skip.cpp
diff --git a/tests/auto/selftests/skipglobal/skipglobal.pro b/tests/auto/testlib/selftests/skipglobal/skipglobal.pro
index fb8d40cbd9..fb8d40cbd9 100644
--- a/tests/auto/selftests/skipglobal/skipglobal.pro
+++ b/tests/auto/testlib/selftests/skipglobal/skipglobal.pro
diff --git a/tests/auto/selftests/skipglobal/tst_skipglobal.cpp b/tests/auto/testlib/selftests/skipglobal/tst_skipglobal.cpp
index aec32ed0c0..aec32ed0c0 100644
--- a/tests/auto/selftests/skipglobal/tst_skipglobal.cpp
+++ b/tests/auto/testlib/selftests/skipglobal/tst_skipglobal.cpp
diff --git a/tests/auto/selftests/skipinit/skipinit.pro b/tests/auto/testlib/selftests/skipinit/skipinit.pro
index 3d458f3669..3d458f3669 100644
--- a/tests/auto/selftests/skipinit/skipinit.pro
+++ b/tests/auto/testlib/selftests/skipinit/skipinit.pro
diff --git a/tests/auto/selftests/skipinit/tst_skipinit.cpp b/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp
index 4cd882f747..4cd882f747 100644
--- a/tests/auto/selftests/skipinit/tst_skipinit.cpp
+++ b/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp
diff --git a/tests/auto/selftests/skipinitdata/skipinitdata.pro b/tests/auto/testlib/selftests/skipinitdata/skipinitdata.pro
index 26119eb70c..26119eb70c 100644
--- a/tests/auto/selftests/skipinitdata/skipinitdata.pro
+++ b/tests/auto/testlib/selftests/skipinitdata/skipinitdata.pro
diff --git a/tests/auto/selftests/skipinitdata/tst_skipinitdata.cpp b/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp
index fb97fc978d..fb97fc978d 100644
--- a/tests/auto/selftests/skipinitdata/tst_skipinitdata.cpp
+++ b/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp
diff --git a/tests/auto/selftests/sleep/sleep.pro b/tests/auto/testlib/selftests/sleep/sleep.pro
index d963e73ed2..d963e73ed2 100644
--- a/tests/auto/selftests/sleep/sleep.pro
+++ b/tests/auto/testlib/selftests/sleep/sleep.pro
diff --git a/tests/auto/selftests/sleep/tst_sleep.cpp b/tests/auto/testlib/selftests/sleep/tst_sleep.cpp
index e509954b5d..e509954b5d 100644
--- a/tests/auto/selftests/sleep/tst_sleep.cpp
+++ b/tests/auto/testlib/selftests/sleep/tst_sleep.cpp
diff --git a/tests/auto/selftests/strcmp/strcmp.pro b/tests/auto/testlib/selftests/strcmp/strcmp.pro
index 8cf1caa906..8cf1caa906 100644
--- a/tests/auto/selftests/strcmp/strcmp.pro
+++ b/tests/auto/testlib/selftests/strcmp/strcmp.pro
diff --git a/tests/auto/selftests/strcmp/tst_strcmp.cpp b/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp
index 89689bb3bc..89689bb3bc 100644
--- a/tests/auto/selftests/strcmp/tst_strcmp.cpp
+++ b/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp
diff --git a/tests/auto/selftests/subtest/subtest.pro b/tests/auto/testlib/selftests/subtest/subtest.pro
index ac237790d2..ac237790d2 100644
--- a/tests/auto/selftests/subtest/subtest.pro
+++ b/tests/auto/testlib/selftests/subtest/subtest.pro
diff --git a/tests/auto/selftests/subtest/tst_subtest.cpp b/tests/auto/testlib/selftests/subtest/tst_subtest.cpp
index 4404a5103f..4404a5103f 100644
--- a/tests/auto/selftests/subtest/tst_subtest.cpp
+++ b/tests/auto/testlib/selftests/subtest/tst_subtest.cpp
diff --git a/tests/auto/selftests/test/test.pro b/tests/auto/testlib/selftests/test/test.pro
index f0e0f7593c..f0e0f7593c 100644
--- a/tests/auto/selftests/test/test.pro
+++ b/tests/auto/testlib/selftests/test/test.pro
diff --git a/tests/auto/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp
index 138e47927f..138e47927f 100644
--- a/tests/auto/selftests/tst_selftests.cpp
+++ b/tests/auto/testlib/selftests/tst_selftests.cpp
diff --git a/tests/auto/selftests/waitwithoutgui/tst_waitwithoutgui.cpp b/tests/auto/testlib/selftests/waitwithoutgui/tst_waitwithoutgui.cpp
index 9c0bb862b3..9c0bb862b3 100644
--- a/tests/auto/selftests/waitwithoutgui/tst_waitwithoutgui.cpp
+++ b/tests/auto/testlib/selftests/waitwithoutgui/tst_waitwithoutgui.cpp
diff --git a/tests/auto/selftests/waitwithoutgui/waitwithoutgui.pro b/tests/auto/testlib/selftests/waitwithoutgui/waitwithoutgui.pro
index 6c28390da9..6c28390da9 100644
--- a/tests/auto/selftests/waitwithoutgui/waitwithoutgui.pro
+++ b/tests/auto/testlib/selftests/waitwithoutgui/waitwithoutgui.pro
diff --git a/tests/auto/selftests/warnings/tst_warnings.cpp b/tests/auto/testlib/selftests/warnings/tst_warnings.cpp
index 52a992c763..52a992c763 100644
--- a/tests/auto/selftests/warnings/tst_warnings.cpp
+++ b/tests/auto/testlib/selftests/warnings/tst_warnings.cpp
diff --git a/tests/auto/selftests/warnings/warnings.pro b/tests/auto/testlib/selftests/warnings/warnings.pro
index 147d96a02f..147d96a02f 100644
--- a/tests/auto/selftests/warnings/warnings.pro
+++ b/tests/auto/testlib/selftests/warnings/warnings.pro
diff --git a/tests/auto/selftests/xunit/tst_xunit.cpp b/tests/auto/testlib/selftests/xunit/tst_xunit.cpp
index 8f2f712426..8f2f712426 100644
--- a/tests/auto/selftests/xunit/tst_xunit.cpp
+++ b/tests/auto/testlib/selftests/xunit/tst_xunit.cpp
diff --git a/tests/auto/selftests/xunit/xunit.pro b/tests/auto/testlib/selftests/xunit/xunit.pro
index e523520ed6..e523520ed6 100644
--- a/tests/auto/selftests/xunit/xunit.pro
+++ b/tests/auto/testlib/selftests/xunit/xunit.pro
diff --git a/tests/auto/testlib/testlib.pro b/tests/auto/testlib/testlib.pro
new file mode 100644
index 0000000000..3a66f8cc6c
--- /dev/null
+++ b/tests/auto/testlib/testlib.pro
@@ -0,0 +1,5 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qsignalspy \
+   selftests \
+