Make clear why QTestLog::addB?XFail() don't add to counters

This reverts commit 904617dfb83f39a6a379635b64fea6fcd00f241a and makes
clear to future readers why that wouldn't be a sensible change.
Update the test's data, eliminating a case of duplicate counting that
was caused by the reverted commit.

Task-number: QTBUG-95661
Change-Id: Ice6d3ab06ca171e0d6eb0fac757f1ab774e229f0
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 7af79ba09148dbfe5c1fc8b130d564dcca7ae4b3)

2 files changed, 7 insertions, 7 deletions

diff --git a/tests/auto/testlib/selftests/expected_blacklisted.tap b/tests/auto/testlib/selftests/expected_blacklisted.tap
index 8107939e6d..d05ee95d92 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 5 - xfail() # TODO This test should BXFAIL 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:0)
   file: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
   line: 0
   ...
-ok 6 - xfail() # TODO 
-ok 7 - xpass() # TODO 'true' returned TRUE unexpectedly. (This test should BXPASS)
+ok 5 - xfail() # TODO 
+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
@@ -31,14 +31,14 @@ ok 7 - 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 8 - messages() # TODO Received a fatal error.
+not ok 7 - messages() # TODO Received a fatal error.
   ---
   # Received a fatal error.
   at: tst_Blacklisted::messages() (Unknown file:0)
   file: Unknown file
   line: 0
   ...
-1..8
-# tests 8
+1..7
+# tests 7
 # pass 1
 # fail 0
diff --git a/tests/auto/testlib/selftests/expected_blacklisted.txt b/tests/auto/testlib/selftests/expected_blacklisted.txt
index da59bbfecf..fccaa7d8c3 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, 6 blacklisted, 0ms
+Totals: 1 passed, 0 failed, 1 skipped, 5 blacklisted, 0ms
 ********* Finished testing of tst_Blacklisted *********