diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-17 22:02:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-17 22:02:25 (GMT) |
| commit | 618db3621a845e02d0e557f9eed4908facbabb22 (patch) | |
| tree | 737d40e5fd2124721e7a9d6cf783411c81f9b708 | |
| parent | 50e1b4166f7a6ced50d6aa4fbdbe315048a0ebc2 (diff) | |
| parent | 076ee3e8a2a631671dea5787924ed3181c5a919c (diff) | |
| download | git-618db3621a845e02d0e557f9eed4908facbabb22.zip git-618db3621a845e02d0e557f9eed4908facbabb22.tar.gz git-618db3621a845e02d0e557f9eed4908facbabb22.tar.bz2 | |
Merge branch 'js/test-write-junit-xml-fix' into maint
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 44df51b..0ea1e5a 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" |