summaryrefslogtreecommitdiffstats
path: root/tests/auto/testlib
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-07-22 14:01:47 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-07-22 23:23:09 +0200
commit61b1146e5a91993dbf0f9a7bd5acd61ebcc61923 (patch)
treeae6a60f895d00c52aaf4c552a7f035415b56e167 /tests/auto/testlib
parentb33c056a61b13235186ba196e82618211ebe5ae4 (diff)
testlib selftest: check blacklisted test for test failures
Change-Id: Ifcd1155f7627f6a9f8b379fb9e87425f9d9f2877 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'tests/auto/testlib')
-rw-r--r--tests/auto/testlib/selftests/expected_blacklisted.tap12
-rw-r--r--tests/auto/testlib/selftests/expected_blacklisted.txt2
-rw-r--r--tests/auto/testlib/selftests/tst_selftests.cpp1
3 files changed, 7 insertions, 8 deletions
diff --git a/tests/auto/testlib/selftests/expected_blacklisted.tap b/tests/auto/testlib/selftests/expected_blacklisted.tap
index d05ee95d92..8107939e6d 100644
--- a/tests/auto/testlib/selftests/expected_blacklisted.tap
+++ b/tests/auto/testlib/selftests/expected_blacklisted.tap
@@ -15,15 +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: 0
...
-not ok 4 - xfail() # TODO This test should BXFAIL then BPASS
+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
...
-ok 5 - xfail() # TODO
-ok 6 - xpass() # TODO 'true' returned TRUE unexpectedly. (This test should BXPASS)
+ok 6 - xfail() # TODO
+ok 7 - 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
@@ -31,14 +31,14 @@ ok 6 - xpass() # TODO 'true' returned TRUE unexpectedly. (This test should BXPAS
# This is an info message that should not appear in silent test output
# This is an internal testlib info message that should not appear in silent test output
# This is a fatal error message that should still appear in silent test output
-not ok 7 - messages() # TODO Received a fatal error.
+not ok 8 - messages() # TODO Received a fatal error.
---
# Received a fatal error.
at: tst_Blacklisted::messages() (Unknown file:0)
file: Unknown file
line: 0
...
-1..7
-# tests 7
+1..8
+# tests 8
# pass 1
# fail 0
diff --git a/tests/auto/testlib/selftests/expected_blacklisted.txt b/tests/auto/testlib/selftests/expected_blacklisted.txt
index fccaa7d8c3..da59bbfecf 100644
--- a/tests/auto/testlib/selftests/expected_blacklisted.txt
+++ b/tests/auto/testlib/selftests/expected_blacklisted.txt
@@ -22,5 +22,5 @@ INFO : tst_Blacklisted::messages() This is an internal testlib info message th
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, 0 failed, 1 skipped, 5 blacklisted, 0ms
+Totals: 1 passed, 0 failed, 1 skipped, 6 blacklisted, 0ms
********* Finished testing of tst_Blacklisted *********
diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp
index 350a528893..e63f8a427f 100644
--- a/tests/auto/testlib/selftests/tst_selftests.cpp
+++ b/tests/auto/testlib/selftests/tst_selftests.cpp
@@ -708,7 +708,6 @@ bool TestLogger::shouldIgnoreTest(const QString &test) const
|| test == "multiexec"
|| test == "qexecstringlist"
|| test == "benchliboptions"
- || test == "blacklisted"
|| test == "printdatatags"
|| test == "printdatatagswithglobaltags"
|| test == "silent")