@@ -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
}