Merge branch 'js/test-write-junit-xml-fix' into maint

gitster · gitster · commit 618db3621a84 · 2020-03-17T15:02:25.000-07:00
Testfix.

* js/test-write-junit-xml-fix:
  tests: fix --write-junit-xml with subshells
diff --git 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"
 
