summaryrefslogtreecommitdiffstats
path: root/tests/auto/testlib/selftests/expected_subtest.txt
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2016-07-29 13:18:24 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2017-10-11 09:59:44 +0000
commit98ef376fb6053ab4171fa9b7c98916f0dbb1b798 (patch)
tree91306c0a9e3d28ae5da3720bcfa76ba003a49638 /tests/auto/testlib/selftests/expected_subtest.txt
parentaebc9023bb0acb9697540b444a6dfae95b762644 (diff)
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>
Diffstat (limited to 'tests/auto/testlib/selftests/expected_subtest.txt')
-rw-r--r--tests/auto/testlib/selftests/expected_subtest.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/testlib/selftests/expected_subtest.txt b/tests/auto/testlib/selftests/expected_subtest.txt
index ba710e54a9..8b0dbf63ee 100644
--- a/tests/auto/testlib/selftests/expected_subtest.txt
+++ b/tests/auto/testlib/selftests/expected_subtest.txt
@@ -1,5 +1,5 @@
********* Start testing of tst_Subtest *********
-Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@
+Config: Using QtTest library
QDEBUG : tst_Subtest::initTestCase() initTestCase initTestCase (null)
PASS : tst_Subtest::initTestCase()
QDEBUG : tst_Subtest::test1() init test1 (null)
@@ -35,16 +35,16 @@ QDEBUG : tst_Subtest::test3(data1) test2 test3 data1
FAIL! : tst_Subtest::test3(data1) Compared values are not the same
Actual (str) : "hello1"
Expected (QString("hello0")): "hello0"
- Loc: [tst_subtest.cpp(154)]
+ Loc: [qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp(0)]
QDEBUG : tst_Subtest::test3(data1) cleanup test3 data1
QDEBUG : tst_Subtest::test3(data2) init test3 data2
QDEBUG : tst_Subtest::test3(data2) test2 test3 data2
FAIL! : tst_Subtest::test3(data2) Compared values are not the same
Actual (str) : "hello2"
Expected (QString("hello0")): "hello0"
- Loc: [tst_subtest.cpp(154)]
+ Loc: [qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp(0)]
QDEBUG : tst_Subtest::test3(data2) cleanup test3 data2
QDEBUG : tst_Subtest::cleanupTestCase() cleanupTestCase cleanupTestCase (null)
PASS : tst_Subtest::cleanupTestCase()
-Totals: 7 passed, 2 failed, 0 skipped, 0 blacklisted
+Totals: 7 passed, 2 failed, 0 skipped, 0 blacklisted, 0ms
********* Finished testing of tst_Subtest *********