generate_expected_output.py: update generated expected_* files

In selftests.qrc, imposed alphabetic order (on stem of name, then on
suffix, effectively treating . as sorting before any letter) while
removing old tests and adding new tests and data.  Updated all non-csv
files and added many missing files.  (Not clear on csv support status;
the script seems to have dropped it after 5.6, but the test still uses
it.)

Left expected_crashes* alone (no new files added, no update to old) as
I don't get results resembling those anticipated.

Omitted printdatatagswithglobaltags, printdatatags due to dangling
hspace on output lines, which upset sanity-bot.  A change to the test
cpp is needed to make it viable to skip that dangling hspace.

Change-Id: Iab3fb626c44a91c249b2fb626c12c75ea0317098
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>

1 files changed, 36 insertions, 36 deletions

diff --git a/tests/auto/testlib/selftests/expected_verbose2.txt b/tests/auto/testlib/selftests/expected_verbose2.txt
index 8e4e01b526..a46c398a4f 100644
--- a/tests/auto/testlib/selftests/expected_verbose2.txt
+++ b/tests/auto/testlib/selftests/expected_verbose2.txt
@@ -1,105 +1,105 @@
 ********* Start testing of tst_Counting *********
-Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@
+Config: Using QtTest library
 INFO   : tst_Counting::initTestCase() entering
 PASS   : tst_Counting::initTestCase()
 INFO   : tst_Counting::testPassPass() entering
 INFO   : tst_Counting::testPassPass(row 1) QVERIFY(true)
-   Loc: [../counting/tst_counting.cpp(111)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 INFO   : tst_Counting::testPassPass(row 1) QCOMPARE(2 + 1, 3)
-   Loc: [../counting/tst_counting.cpp(112)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 PASS   : tst_Counting::testPassPass(row 1)
 INFO   : tst_Counting::testPassPass(row 2) QVERIFY(true)
-   Loc: [../counting/tst_counting.cpp(111)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 INFO   : tst_Counting::testPassPass(row 2) QCOMPARE(2 + 1, 3)
-   Loc: [../counting/tst_counting.cpp(112)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 PASS   : tst_Counting::testPassPass(row 2)
 INFO   : tst_Counting::testPassSkip() entering
 INFO   : tst_Counting::testPassSkip(row 1) QVERIFY(true)
-   Loc: [../counting/tst_counting.cpp(111)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 INFO   : tst_Counting::testPassSkip(row 1) QCOMPARE(2 + 1, 3)
-   Loc: [../counting/tst_counting.cpp(112)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 PASS   : tst_Counting::testPassSkip(row 1)
 SKIP   : tst_Counting::testPassSkip(row 2) Skipping
-   Loc: [../counting/tst_counting.cpp(118)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 INFO   : tst_Counting::testPassFail() entering
 INFO   : tst_Counting::testPassFail(row 1) QVERIFY(true)
-   Loc: [../counting/tst_counting.cpp(111)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 INFO   : tst_Counting::testPassFail(row 1) QCOMPARE(2 + 1, 3)
-   Loc: [../counting/tst_counting.cpp(112)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 PASS   : tst_Counting::testPassFail(row 1)
 INFO   : tst_Counting::testPassFail(row 2) QVERIFY(false)
-   Loc: [../counting/tst_counting.cpp(115)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 FAIL!  : tst_Counting::testPassFail(row 2) 'false' returned FALSE. ()
-   Loc: [../counting/tst_counting.cpp(115)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 INFO   : tst_Counting::testSkipPass() entering
 SKIP   : tst_Counting::testSkipPass(row 1) Skipping
-   Loc: [../counting/tst_counting.cpp(118)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 INFO   : tst_Counting::testSkipPass(row 2) QVERIFY(true)
-   Loc: [../counting/tst_counting.cpp(111)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 INFO   : tst_Counting::testSkipPass(row 2) QCOMPARE(2 + 1, 3)
-   Loc: [../counting/tst_counting.cpp(112)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 PASS   : tst_Counting::testSkipPass(row 2)
 INFO   : tst_Counting::testSkipSkip() entering
 SKIP   : tst_Counting::testSkipSkip(row 1) Skipping
-   Loc: [../counting/tst_counting.cpp(118)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 SKIP   : tst_Counting::testSkipSkip(row 2) Skipping
-   Loc: [../counting/tst_counting.cpp(118)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 INFO   : tst_Counting::testSkipFail() entering
 SKIP   : tst_Counting::testSkipFail(row 1) Skipping
-   Loc: [../counting/tst_counting.cpp(118)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 INFO   : tst_Counting::testSkipFail(row 2) QVERIFY(false)
-   Loc: [../counting/tst_counting.cpp(115)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 FAIL!  : tst_Counting::testSkipFail(row 2) 'false' returned FALSE. ()
-   Loc: [../counting/tst_counting.cpp(115)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 INFO   : tst_Counting::testFailPass() entering
 INFO   : tst_Counting::testFailPass(row 1) QVERIFY(false)
-   Loc: [../counting/tst_counting.cpp(115)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 FAIL!  : tst_Counting::testFailPass(row 1) 'false' returned FALSE. ()
-   Loc: [../counting/tst_counting.cpp(115)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 INFO   : tst_Counting::testFailPass(row 2) QVERIFY(true)
-   Loc: [../counting/tst_counting.cpp(111)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 INFO   : tst_Counting::testFailPass(row 2) QCOMPARE(2 + 1, 3)
-   Loc: [../counting/tst_counting.cpp(112)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 PASS   : tst_Counting::testFailPass(row 2)
 INFO   : tst_Counting::testFailSkip() entering
 INFO   : tst_Counting::testFailSkip(row 1) QVERIFY(false)
-   Loc: [../counting/tst_counting.cpp(115)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 FAIL!  : tst_Counting::testFailSkip(row 1) 'false' returned FALSE. ()
-   Loc: [../counting/tst_counting.cpp(115)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 SKIP   : tst_Counting::testFailSkip(row 2) Skipping
-   Loc: [../counting/tst_counting.cpp(118)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 INFO   : tst_Counting::testFailFail() entering
 INFO   : tst_Counting::testFailFail(row 1) QVERIFY(false)
-   Loc: [../counting/tst_counting.cpp(115)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 FAIL!  : tst_Counting::testFailFail(row 1) 'false' returned FALSE. ()
-   Loc: [../counting/tst_counting.cpp(115)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 INFO   : tst_Counting::testFailFail(row 2) QVERIFY(false)
-   Loc: [../counting/tst_counting.cpp(115)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 FAIL!  : tst_Counting::testFailFail(row 2) 'false' returned FALSE. ()
-   Loc: [../counting/tst_counting.cpp(115)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 INFO   : tst_Counting::testFailInInit() entering
 PASS   : tst_Counting::testFailInInit(before)
 FAIL!  : tst_Counting::testFailInInit(fail) Fail in init()
-   Loc: [../counting/tst_counting.cpp(234)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 PASS   : tst_Counting::testFailInInit(after)
 INFO   : tst_Counting::testFailInCleanup() entering
 PASS   : tst_Counting::testFailInCleanup(before)
 QDEBUG : tst_Counting::testFailInCleanup(fail) This test function should execute and then QFAIL in cleanup()
 FAIL!  : tst_Counting::testFailInCleanup(fail) Fail in cleanup()
-   Loc: [../counting/tst_counting.cpp(242)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 PASS   : tst_Counting::testFailInCleanup(after)
 INFO   : tst_Counting::testSkipInInit() entering
 PASS   : tst_Counting::testSkipInInit(before)
 SKIP   : tst_Counting::testSkipInInit(skip) Skip in init()
-   Loc: [../counting/tst_counting.cpp(236)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 PASS   : tst_Counting::testSkipInInit(after)
 INFO   : tst_Counting::testSkipInCleanup() entering
 PASS   : tst_Counting::testSkipInCleanup(before)
 QDEBUG : tst_Counting::testSkipInCleanup(skip) This test function should execute and then QSKIP in cleanup()
 SKIP   : tst_Counting::testSkipInCleanup(skip) Skip in cleanup()
-   Loc: [../counting/tst_counting.cpp(244)]
+   Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)]
 PASS   : tst_Counting::testSkipInCleanup(after)
 INFO   : tst_Counting::cleanupTestCase() entering
 PASS   : tst_Counting::cleanupTestCase()
-Totals: 16 passed, 8 failed, 8 skipped, 0 blacklisted
+Totals: 16 passed, 8 failed, 8 skipped, 0 blacklisted, 0ms
 ********* Finished testing of tst_Counting *********