[PATCH v2 11/13] tests: record more stderr with --write-junit-xml in case of failure

[Johannes Schindelin via GitGitGadget]

From: Johannes Schindelin <johannes.schinde...@gmx.de>

Sometimes, failures in a test case are actually caused by issues in
earlier test cases.

To make it easier to see those issues, let's attach the output from
before the failing test case (i.e. stdout/stderr since the previous
failing test case, or the start of the test script). This will be
visible in the "Attachments" of the details of the failed test.

Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de>
---
 t/test-lib.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 8a60e39364..5f62418f9c 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -479,6 +479,9 @@ test_failure_ () {
                        "$(cat "$GIT_TEST_TEE_OUTPUT_FILE")")"
                >"$GIT_TEST_TEE_OUTPUT_FILE"
                junit_insert="$junit_insert</failure>"
+               junit_insert="$junit_insert<system-err>$(xml_attr_encode \
+                       "$(cat "$GIT_TEST_TEE_OUTPUT_FILE.err")")</system-err>"
+               >"$GIT_TEST_TEE_OUTPUT_FILE.err"
                write_junit_xml_testcase "$1" "      $junit_insert"
        fi
        test_failure=$(($test_failure + 1))
@@ -763,9 +766,12 @@ test_start_ () {
        then
                junit_start=$(test-tool date getnanos)
 
-               # truncate output
-               test -z "$GIT_TEST_TEE_OUTPUT_FILE" ||
-               >"$GIT_TEST_TEE_OUTPUT_FILE"
+               # append to future <system-err>; truncate output
+               test -z "$GIT_TEST_TEE_OUTPUT_FILE" || {
+                       cat "$GIT_TEST_TEE_OUTPUT_FILE" \
+                               >>"$GIT_TEST_TEE_OUTPUT_FILE.err"
+                       >"$GIT_TEST_TEE_OUTPUT_FILE"
+               }
        fi
 }
 
-- 
gitgitgadget