Move TAP's messages block to after the primary report details

In the process, split it from its comments block and don't bother with
a YAML block if it would only have contained comments.

Task-number: QTBUG-96844
Change-Id: I08c20f796252bb270ba9caa4c055cdcc0843a88b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

1 files changed, 8 insertions, 8 deletions

diff --git a/tests/auto/testlib/selftests/expected_expectfail.tap b/tests/auto/testlib/selftests/expected_expectfail.tap
index be6169bc38..c61f47fd48 100644
--- a/tests/auto/testlib/selftests/expected_expectfail.tap
+++ b/tests/auto/testlib/selftests/expected_expectfail.tap
@@ -3,24 +3,24 @@ TAP version 13
 ok 1 - initTestCase()
 not ok 2 - xfailAndContinue() # TODO This should xfail
   ---
+  at: tst_ExpectFail::xfailAndContinue() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
+  file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
+  line: 0
   extensions:
     messages:
     - severity: debug
       message: begin
-  at: tst_ExpectFail::xfailAndContinue() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
-  file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
-  line: 0
   ...
 # debug: after
 not ok 3 - xfailAndAbort() # TODO This should xfail
   ---
+  at: tst_ExpectFail::xfailAndAbort() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
+  file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
+  line: 0
   extensions:
     messages:
     - severity: debug
       message: begin
-  at: tst_ExpectFail::xfailAndAbort() (qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp:0)
-  file: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
-  line: 0
   ...
 not ok 4 - xfailContinueSkip() # TODO This should xfail then skip
   ---
@@ -147,19 +147,19 @@ not ok 27 - xfailOnAnyRow(Fail Continue) # TODO This test should xfail
   ...
 not ok 28 - xfailWithoutCheck(Fail Abort)
   ---
+  # QEXPECT_FAIL was called without any subsequent verification statements
   extensions:
     messages:
     - severity: debug
       message: Should fail (*not* xfail), despite test-case name
-  # QEXPECT_FAIL was called without any subsequent verification statements
   ...
 not ok 29 - xfailWithoutCheck(Fail Continue)
   ---
+  # QEXPECT_FAIL was called without any subsequent verification statements
   extensions:
     messages:
     - severity: debug
       message: Should fail (*not* xfail), despite test-case name
-  # QEXPECT_FAIL was called without any subsequent verification statements
   ...
 ok 30 - xpassAbort() # TODO 'true' returned TRUE unexpectedly. ()
 ok 31 - xpassAbortSkip() # TODO 'true' returned TRUE unexpectedly. ()