diff options
author | Liang Qi <liang.qi@qt.io> | 2019-02-08 09:28:00 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-02-08 12:31:02 +0100 |
commit | fbfacd33be482fa3cf0aa5cffaf7006d538a2f92 (patch) | |
tree | 92da72786b3740e37004623612c4fc1c9640d30f /tests/auto/testlib/selftests/expected_blacklisted.tap | |
parent | c1f4286a5cbc1794fe7be5bdbbd6a0bf29ef84d4 (diff) | |
parent | 74e04d6ace7aa949db97ae2e46c38a4dc0d4d36a (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/android/templates/AndroidManifest.xml
src/network/ssl/qsslsocket_mac.cpp
src/widgets/styles/qstylesheetstyle.cpp
tests/auto/corelib/kernel/qtimer/BLACKLIST
tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
tests/auto/testlib/selftests/expected_blacklisted.lightxml
tests/auto/testlib/selftests/expected_blacklisted.tap
tests/auto/testlib/selftests/expected_blacklisted.teamcity
tests/auto/testlib/selftests/expected_blacklisted.txt
tests/auto/testlib/selftests/expected_blacklisted.xml
tests/auto/testlib/selftests/expected_blacklisted.xunitxml
tests/auto/testlib/selftests/expected_float.tap
tests/auto/testlib/selftests/expected_float.teamcity
tests/auto/testlib/selftests/expected_float.txt
tests/auto/testlib/selftests/expected_float.xunitxml
Done-With: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Done-With: Edward Welbourne <edward.welbourne@qt.io>
Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io>
Change-Id: If93cc432a56ae3ac1b6533d0028e4dc497415a52
Diffstat (limited to 'tests/auto/testlib/selftests/expected_blacklisted.tap')
-rw-r--r-- | tests/auto/testlib/selftests/expected_blacklisted.tap | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/testlib/selftests/expected_blacklisted.tap b/tests/auto/testlib/selftests/expected_blacklisted.tap index f26155ded0..35f6d3df50 100644 --- a/tests/auto/testlib/selftests/expected_blacklisted.tap +++ b/tests/auto/testlib/selftests/expected_blacklisted.tap @@ -15,14 +15,15 @@ not ok 4 - fail() # TODO 'false' returned FALSE. (This test should BFAIL) file: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp line: 63 ... -not ok 5 - xfail() # TODO This test should XFAIL then BPASS +not ok 4 - xfail() # TODO This test should BXFAIL then BPASS --- + # This test should BXFAIL then BPASS at: tst_Blacklisted::xfail() (qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp:69) file: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp line: 69 ... ok 5 - xfail() # TODO -ok 6 - xpass() # TODO 'true' returned TRUE unexpectedly. (This test should XPASS, blacklist ignored for XPASS) +ok 6 - xpass() # TODO 'true' returned TRUE unexpectedly. (This test should BXPASS) # This is a warning that should not appear in silent test output # This is an internal testlib warning that should not appear in silent test output # This is a debug message that should not appear in silent test output @@ -40,4 +41,4 @@ not ok 7 - messages() # TODO Received a fatal error. 1..7 # tests 7 # pass 1 -# fail 1 +# fail 0 |