Merge branch 'js/ci-github-workflow-markup' into maint

A fix for a regression in test framework.
source: <pull.1288.git.1657789234416.gitgitgadget@gmail.com>

* js/ci-github-workflow-markup:
  tests: fix incorrect --write-junit-xml code
This commit is contained in:
Junio C Hamano 2022-07-27 13:00:25 -07:00
commit c896716d77

View File

@ -46,7 +46,7 @@ finalize_test_case_output () {
shift shift
case "$test_case_result" in case "$test_case_result" in
ok) ok)
set "$*" set -- "$*"
;; ;;
failure) failure)
junit_insert="<failure message=\"not ok $test_count -" junit_insert="<failure message=\"not ok $test_count -"
@ -65,17 +65,17 @@ finalize_test_case_output () {
junit_insert="$junit_insert<system-err>$(xml_attr_encode \ junit_insert="$junit_insert<system-err>$(xml_attr_encode \
"$(cat "$GIT_TEST_TEE_OUTPUT_FILE")")</system-err>" "$(cat "$GIT_TEST_TEE_OUTPUT_FILE")")</system-err>"
fi fi
set "$1" " $junit_insert" set -- "$1" " $junit_insert"
;; ;;
fixed) fixed)
set "$* (breakage fixed)" set -- "$* (breakage fixed)"
;; ;;
broken) broken)
set "$* (known breakage)" set -- "$* (known breakage)"
;; ;;
skip) skip)
message="$(xml_attr_encode --no-lf "$skipped_reason")" message="$(xml_attr_encode --no-lf "$skipped_reason")"
set "$1" " <skipped message=\"$message\" />" set -- "$1" " <skipped message=\"$message\" />"
;; ;;
esac esac