From 98ef376fb6053ab4171fa9b7c98916f0dbb1b798 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 29 Jul 2016 13:18:24 +0200 Subject: 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 --- tests/auto/testlib/selftests/expected_blacklisted.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/auto/testlib/selftests/expected_blacklisted.txt') diff --git a/tests/auto/testlib/selftests/expected_blacklisted.txt b/tests/auto/testlib/selftests/expected_blacklisted.txt index 3afd93b0cc..6fa2403b59 100644 --- a/tests/auto/testlib/selftests/expected_blacklisted.txt +++ b/tests/auto/testlib/selftests/expected_blacklisted.txt @@ -1,26 +1,26 @@ ********* Start testing of tst_Blacklisted ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_Blacklisted::initTestCase() BPASS : tst_Blacklisted::pass() SKIP : tst_Blacklisted::skip() This test should SKIP - Loc: [tst_blacklisted.cpp(62)] + Loc: [qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)] BFAIL : tst_Blacklisted::fail() 'false' returned FALSE. (This test should BFAIL) - Loc: [tst_blacklisted.cpp(67)] + Loc: [qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)] XFAIL : tst_Blacklisted::xfail() This test should XFAIL then BFAIL - Loc: [tst_blacklisted.cpp(73)] + Loc: [qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)] BPASS : tst_Blacklisted::xfail() XPASS : tst_Blacklisted::xpass() 'true' returned TRUE unexpectedly. (This test should XPASS, blacklist ignored for XPASS) - Loc: [tst_blacklisted.cpp(79)] + Loc: [qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)] QWARN : tst_Blacklisted::messages() This is a warning that should not appear in silent test output WARNING: tst_Blacklisted::messages() This is an internal testlib warning that should not appear in silent test output - Loc: [tst_blacklisted.cpp(85)] + Loc: [qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)] QDEBUG : tst_Blacklisted::messages() This is a debug message that should not appear in silent test output QSYSTEM: tst_Blacklisted::messages() This is a critical message that should not appear in silent test output QINFO : tst_Blacklisted::messages() This is an info message that should not appear in silent test output INFO : tst_Blacklisted::messages() This is an internal testlib info message that should not appear in silent test output - Loc: [tst_blacklisted.cpp(89)] + Loc: [qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)] QFATAL : tst_Blacklisted::messages() This is a fatal error message that should still appear in silent test output BFAIL : tst_Blacklisted::messages() Received a fatal error. Loc: [Unknown file(0)] -Totals: 1 passed, 1 failed, 1 skipped, 4 blacklisted +Totals: 1 passed, 1 failed, 1 skipped, 4 blacklisted, 0ms ********* Finished testing of tst_Blacklisted ********* -- cgit v1.2.3