fixup! tests: include detailed trace logs with --write-junit-xml upon failure

It is actually better not to modify (or even truncate) the .out files
because the ci/ scripts want to provide a full output in the log.

So let's just remember the file offset at the beginning of each test
case, and use `cut <offset>-` to use that specifically.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

t/test-lib.sh

@@ -513,35 +513,21 @@ test_ok_ () {
 test_failure_ () {
 	if test -n "$write_junit_xml"
 	then
-		if test -z "$GIT_TEST_TEE_OUTPUT_FILE"
-		then
-			# clean up
-			test_atexit_handler
-
-			# re-run with --verbose-log
-			echo "# Re-running: $junit_rerun_options_sq" >&2
-
-			cd "$TEST_DIRECTORY" &&
-			eval "${TEST_SHELL_PATH}" "$junit_rerun_options_sq" \
-				>/dev/null 2>&1
-			status=$?
-
-			say_color "" "$(test 0 = $status ||
-				echo "not ")ok $test_count - (re-ran with trace)"
-			say "1..$test_count"
-			GIT_EXIT_OK=t
-			exit $status
-		fi
-
 		junit_insert="<failure message=\"not ok $test_count -"
 		junit_insert="$junit_insert $(xml_attr_encode "$1")\">"
 		junit_insert="$junit_insert $(xml_attr_encode \
-			"$(cat "$GIT_TEST_TEE_OUTPUT_FILE")")"
-		>"$GIT_TEST_TEE_OUTPUT_FILE"
+			"$(if test -n "$GIT_TEST_TEE_OUTPUT_FILE"
+			   then
+				cut -c "$GIT_TEST_TEE_OFFSET-" <"$GIT_TEST_TEE_OUTPUT_FILE"
+			   else
+				printf '%s\n' "$@" | sed 1d
+			   fi)")"
 		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"
+		if test -n "$GIT_TEST_TEE_OUTPUT_FILE"
+		then
+			junit_insert="$junit_insert<system-err>$(xml_attr_encode \
+				"$(cat "$GIT_TEST_TEE_OUTPUT_FILE")")</system-err>"
+		fi
 		write_junit_xml_testcase "$1" "      $junit_insert"
 	fi
 	test_failure=$(($test_failure + 1))
@@ -830,13 +816,6 @@ test_start_ () {
 	if test -n "$write_junit_xml"
 	then
 		junit_start=$(test-tool date getnanos)
-
-		# 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
 }
 
@@ -928,6 +907,10 @@ write_junit_xml_testcase () {
 	write_junit_xml "$(printf '%s\n' \
 		"    <testcase $junit_attrs>" "$@" "    </testcase>")"
 	junit_have_testcase=t
+	if test -n "$GIT_TEST_TEE_OUTPUT_FILE"
+	then
+		GIT_TEST_TEE_OFFSET=$(perl -e 'print -s $ARGV[0]' "$GIT_TEST_TEE_OUTPUT_FILE")
+	fi
 }
 
 test_done () {
@@ -1218,6 +1201,11 @@ then
 		date +%Y-%m-%dT%H:%M:%S)\""
 	write_junit_xml --truncate "<testsuites>" "  <testsuite $junit_attrs>"
 	junit_suite_start=$(test-tool date getnanos)
+	if test -n "$GIT_TEST_TEE_OUTPUT_FILE"
+	then
+		GIT_TEST_TEE_OFFSET=0
+		GIT_TEST_TEE_ERR_OFFSET=0
+	fi
 fi
 
 # Provide an implementation of the 'yes' utility