1 files changed, 31 insertions, 20 deletions
diff --git a/tests/auto/testlib/selftests/expected_verbose2.tap b/tests/auto/testlib/selftests/expected_verbose2.tap
index 828e02b13e..8f7d4fac69 100644
--- a/tests/auto/testlib/selftests/expected_verbose2.tap
+++ b/tests/auto/testlib/selftests/expected_verbose2.tap
@@ -1,21 +1,21 @@
 TAP version 13
 # tst_Counting
 ok 1 - initTestCase()
-# QVERIFY(true)
-# QCOMPARE(2 + 1, 3)
 ok 2 - testPassPass(row 1)
-# QVERIFY(true)
-# QCOMPARE(2 + 1, 3)
+  # inform: QVERIFY(true)
+  # inform: QCOMPARE(2 + 1, 3)
 ok 3 - testPassPass(row 2)
-# QVERIFY(true)
-# QCOMPARE(2 + 1, 3)
+  # inform: QVERIFY(true)
+  # inform: QCOMPARE(2 + 1, 3)
 ok 4 - testPassSkip(row 1)
+  # inform: QVERIFY(true)
+  # inform: QCOMPARE(2 + 1, 3)
 ok 5 - testPassSkip(row 2) # SKIP Skipping
-# QVERIFY(true)
-# QCOMPARE(2 + 1, 3)
 ok 6 - testPassFail(row 1)
-# QVERIFY(false)
+  # inform: QVERIFY(true)
+  # inform: QCOMPARE(2 + 1, 3)
 not ok 7 - testPassFail(row 2)
+  # inform: QVERIFY(false)
   ---
   type: QVERIFY
   message: Verification failed
@@ -28,14 +28,14 @@ not ok 7 - testPassFail(row 2)
   line: 0
   ...
 ok 8 - testSkipPass(row 1) # SKIP Skipping
-# QVERIFY(true)
-# QCOMPARE(2 + 1, 3)
 ok 9 - testSkipPass(row 2)
+  # inform: QVERIFY(true)
+  # inform: QCOMPARE(2 + 1, 3)
 ok 10 - testSkipSkip(row 1) # SKIP Skipping
 ok 11 - testSkipSkip(row 2) # SKIP Skipping
 ok 12 - testSkipFail(row 1) # SKIP Skipping
-# QVERIFY(false)
 not ok 13 - testSkipFail(row 2)
+  # inform: QVERIFY(false)
   ---
   type: QVERIFY
   message: Verification failed
@@ -47,8 +47,8 @@ not ok 13 - testSkipFail(row 2)
   file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp
   line: 0
   ...
-# QVERIFY(false)
 not ok 14 - testFailPass(row 1)
+  # inform: QVERIFY(false)
   ---
   type: QVERIFY
   message: Verification failed
@@ -60,11 +60,11 @@ not ok 14 - testFailPass(row 1)
   file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp
   line: 0
   ...
-# QVERIFY(true)
-# QCOMPARE(2 + 1, 3)
 ok 15 - testFailPass(row 2)
-# QVERIFY(false)
+  # inform: QVERIFY(true)
+  # inform: QCOMPARE(2 + 1, 3)
 not ok 16 - testFailSkip(row 1)
+  # inform: QVERIFY(false)
   ---
   type: QVERIFY
   message: Verification failed
@@ -77,8 +77,8 @@ not ok 16 - testFailSkip(row 1)
   line: 0
   ...
 ok 17 - testFailSkip(row 2) # SKIP Skipping
-# QVERIFY(false)
 not ok 18 - testFailFail(row 1)
+  # inform: QVERIFY(false)
   ---
   type: QVERIFY
   message: Verification failed
@@ -90,8 +90,8 @@ not ok 18 - testFailFail(row 1)
   file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp
   line: 0
   ...
-# QVERIFY(false)
 not ok 19 - testFailFail(row 2)
+  # inform: QVERIFY(false)
   ---
   type: QVERIFY
   message: Verification failed
@@ -113,21 +113,32 @@ not ok 21 - testFailInInit(fail)
   ...
 ok 22 - testFailInInit(after)
 ok 23 - testFailInCleanup(before)
-# This test function should execute and then QFAIL in cleanup()
 not ok 24 - testFailInCleanup(fail)
   ---
   # Fail in cleanup()
   at: tst_Counting::testFailInCleanup() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:0)
   file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp
   line: 0
+  extensions:
+    messages:
+    - severity: debug
+      message: This test function should execute and then QFAIL in cleanup()
   ...
 ok 25 - testFailInCleanup(after)
 ok 26 - testSkipInInit(before)
 ok 27 - testSkipInInit(skip) # SKIP Skip in init()
 ok 28 - testSkipInInit(after)
 ok 29 - testSkipInCleanup(before)
-# This test function should execute and then QSKIP in cleanup()
 ok 30 - testSkipInCleanup(skip) # SKIP Skip in cleanup()
+  ---
+  at: tst_Counting::testSkipInCleanup() (qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp:0)
+  file: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp
+  line: 0
+  extensions:
+    messages:
+    - severity: debug
+      message: This test function should execute and then QSKIP in cleanup()
+  ...
 ok 31 - testSkipInCleanup(after)
 ok 32 - cleanupTestCase()
 1..32