Fix junitrunner
Also adds it to CI.
Closes #8117.
PiperOrigin-RevId: 245245574
diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
index 07dc2a5..67ef79a 100644
--- a/.bazelci/postsubmit.yml
+++ b/.bazelci/postsubmit.yml
@@ -13,6 +13,7 @@
test_targets:
- "--"
- "//scripts/..."
+ - "//src/java_tools/junitrunner/javatests/..."
- "//src/test/..."
- "//src/tools/singlejar/..."
- "//third_party/ijar/..."
@@ -34,6 +35,7 @@
test_targets:
- "--"
- "//scripts/..."
+ - "//src/java_tools/junitrunner/javatests/..."
- "//src/test/..."
- "//src/tools/singlejar/..."
- "//third_party/ijar/..."
@@ -55,6 +57,7 @@
test_targets:
- "--"
- "//scripts/..."
+ - "//src/java_tools/junitrunner/javatests/..."
- "//src/test/..."
- "//src/tools/singlejar/..."
- "//third_party/ijar/..."
@@ -86,6 +89,7 @@
test_targets:
- "--"
- "//scripts/..."
+ - "//src/java_tools/junitrunner/javatests/..."
- "//src/test/..."
- "//src/tools/singlejar/..."
- "//third_party/ijar/..."
@@ -149,6 +153,7 @@
test_targets:
- "--"
- "//scripts/..."
+ - "//src/java_tools/junitrunner/javatests/..."
- "//src/test/..."
- "//src/tools/singlejar/..."
- "//third_party/ijar/..."
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 1d89e89..59beb06 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -13,6 +13,7 @@
test_targets:
- "--"
- "//scripts/..."
+ - "//src/java_tools/junitrunner/javatests/..."
- "//src/test/..."
- "//src/tools/execlog/..."
- "//src/tools/singlejar/..."
@@ -38,6 +39,7 @@
test_targets:
- "--"
- "//scripts/..."
+ - "//src/java_tools/junitrunner/javatests/..."
- "//src/test/..."
- "//src/tools/execlog/..."
- "//src/tools/singlejar/..."
@@ -63,6 +65,7 @@
test_targets:
- "--"
- "//scripts/..."
+ - "//src/java_tools/junitrunner/javatests/..."
- "//src/test/..."
- "//src/tools/execlog/..."
- "//src/tools/singlejar/..."
@@ -98,6 +101,7 @@
test_targets:
- "--"
- "//scripts/..."
+ - "//src/java_tools/junitrunner/javatests/..."
- "//src/test/..."
- "//src/tools/execlog/..."
- "//src/tools/singlejar/..."
@@ -161,6 +165,7 @@
test_targets:
- "--"
- "//scripts/..."
+ - "//src/java_tools/junitrunner/javatests/..."
- "//src/test/..."
- "//src/tools/execlog/..."
- "//src/tools/singlejar/..."
diff --git a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/antxmlresultwriter_integration_test.sh b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/antxmlresultwriter_integration_test.sh
index 6ff6720..25da52b 100755
--- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/antxmlresultwriter_integration_test.sh
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/antxmlresultwriter_integration_test.sh
@@ -47,7 +47,7 @@
|| fail "sed to remove timestamps failed"
# Removes the stacktrace from the XML files, it can vary between JDK versions.
- sed -i.bak "$EXT_REGEX_FLAG" '/\w*at [a-zA-Z0-9\$\.]+\([a-zA-Z0-9 \.]*(:[0-9]+)?\)$/d' \
+ sed -i.bak "$EXT_REGEX_FLAG" '/\w*at [a-zA-Z0-9\$\./]+\([a-zA-Z0-9 \.]*(:[0-9]+)?\)$/d' \
"${XML_OUTPUT_FILE}" || fail "sed to remove stacktraces failed"
diff -wu $XML_GOLDEN_OUTPUT_FILE $XML_OUTPUT_FILE \
