AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TAP test logger: treat blacklisted XFail the same as XFail

Browse Source 
In all places but one they were treated the same; fix that last one to
match the rest. This removes one line from the YAML block for each
blacklisted XFail test; in each case, this message duplicates the one
on its "not ok ... # TODO..." test line.

Change-Id: Iff2028afccd979db7f2c84e85d1b78541900008e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Edward Welbourne 2022-03-11 13:37:39 +01:00
parent 44d0cbc7b1
commit 58b0d72f8d
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/testlib/qtaptestlogger.cpp
View File

@ -176,7 +176,7 @@ void QTapTestLogger::addIncident(IncidentTypes type, const char *description,
outputString(YAML_INDENT "---\n");
if (type != XFail) {
if (type != XFail && type != BlacklistedXFail) {
#if QT_CONFIG(regularexpression)
// This is fragile, but unfortunately testlib doesn't plumb
// the expected and actual values to the loggers (yet).

3
tests/auto/testlib/selftests/expected_blacklisted.tap
View File

@ -18,7 +18,6 @@ not ok 4 - fail() # TODO 'false' returned FALSE. (This test should BFAIL)
...
not ok 5 - 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:0)
file: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
line: 0
@ -113,7 +112,6 @@ not ok 7 - multiFail() # TODO But this test should only contribute one to the bl
...
not ok 8 - xfailContinueSkip() # TODO This test should BXFAIL then SKIP
---
# This test should BXFAIL then SKIP
at: tst_Blacklisted::xfailContinueSkip() (qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp:0)
file: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
line: 0
@ -121,7 +119,6 @@ not ok 8 - xfailContinueSkip() # TODO This test should BXFAIL then SKIP
ok 8 - xfailContinueSkip() # SKIP This skip should be seen and counted
not ok 9 - xfailContinueFail() # TODO This test should BXFAIL then BFAIL
---
# This test should BXFAIL then BFAIL
at: tst_Blacklisted::xfailContinueFail() (qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp:0)
file: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
line: 0