summaryrefslogtreecommitdiffstats
path: root/tests/auto/testlib/selftests/expected_skip.teamcity
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_skip.teamcity
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_skip.teamcity')
-rw-r--r--tests/auto/testlib/selftests/expected_skip.teamcity6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/testlib/selftests/expected_skip.teamcity b/tests/auto/testlib/selftests/expected_skip.teamcity
index 5c01cf1ff2..472690195f 100644
--- a/tests/auto/testlib/selftests/expected_skip.teamcity
+++ b/tests/auto/testlib/selftests/expected_skip.teamcity
@@ -1,9 +1,9 @@
##teamcity[testSuiteStarted name='tst_Skip' flowId='tst_Skip']
##teamcity[testStarted name='initTestCase()' flowId='tst_Skip']
##teamcity[testFinished name='initTestCase()' flowId='tst_Skip']
-##teamcity[testIgnored name='test()' message='skipping all |[Loc: tst_skip.cpp(60)|]' flowId='tst_Skip']
-##teamcity[testIgnored name='emptytest()' message='skipping all |[Loc: tst_skip.cpp(70)|]' flowId='tst_Skip']
-##teamcity[testIgnored name='singleSkip(local 1)' message='skipping one |[Loc: tst_skip.cpp(89)|]' flowId='tst_Skip']
+##teamcity[testIgnored name='test()' message='skipping all |[Loc: qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp(0)|]' flowId='tst_Skip']
+##teamcity[testIgnored name='emptytest()' message='skipping all |[Loc: qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp(0)|]' flowId='tst_Skip']
+##teamcity[testIgnored name='singleSkip(local 1)' message='skipping one |[Loc: qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp(0)|]' flowId='tst_Skip']
##teamcity[testStarted name='singleSkip(local 2)' flowId='tst_Skip']
##teamcity[testStdOut name='singleSkip(local 2)' out='QDEBUG: this line should only be reached once (true)' flowId='tst_Skip']
##teamcity[testFinished name='singleSkip(local 2)' flowId='tst_Skip']