diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-17 22:22:18 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-17 22:22:18 +0100 |
| commit | 966b69f02f3e6016303f3cf6fcd5e741d376caf6 (patch) | |
| tree | 2bb39294900c193c6c81361cbe9a251468b4ca60 | |
| parent | Merge branch 'jk/mailinfo-cleanup' (diff) | |
| parent | tests: fix --write-junit-xml with subshells (diff) | |
| download | git-966b69f02f3e6016303f3cf6fcd5e741d376caf6.tar.xz git-966b69f02f3e6016303f3cf6fcd5e741d376caf6.zip | |
Merge branch 'js/test-write-junit-xml-fix'
Testfix.
* js/test-write-junit-xml-fix:
tests: fix --write-junit-xml with subshells
| -rw-r--r-- | t/test-lib.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 44df51be8f..0ea1e5a05e 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1083,7 +1083,8 @@ finalize_junit_xml () { # adjust the overall time junit_time=$(test-tool date getnanos $junit_suite_start) - sed "s/<testsuite [^>]*/& time=\"$junit_time\"/" \ + sed -e "s/\(<testsuite.*\) time=\"[^\"]*\"/\1/" \ + -e "s/<testsuite [^>]*/& time=\"$junit_time\"/" \ <"$junit_xml_path" >"$junit_xml_path.new" mv "$junit_xml_path.new" "$junit_xml_path" |