commit 832d6b479d87a174d888643a05e5c272c4bc908d
author cmita <cmita@google.com> Thu Aug 26 04:33:54 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Aug 26 04:35:22 2021 -0700
tree 4421234ac8c3356683f65fa74ddf317785f5854b
parent 96afa0f01b49f8dfb4db02c1b2a6a60f3a846a01

Fix java shell tests that want to use java_tools built at HEAD.

Some of the Bazel CI workers set override_repository to use prebuilt and
expanded versions of the tool repos so they don't need to be downloaded
and unpackaged every time, but this prevents these tests from testing
a fresh build of the tools.

PiperOrigin-RevId: 393095114

src/test/shell/bazel/bazel_coverage_java_test.sh

diff --git a/src/test/shell/bazel/bazel_coverage_java_test.sh b/src/test/shell/bazel/bazel_coverage_java_test.sh
index 3182170..d891d9f 100755
--- a/src/test/shell/bazel/bazel_coverage_java_test.sh
+++ b/src/test/shell/bazel/bazel_coverage_java_test.sh
@@ -39,6 +39,11 @@
     else
         JAVA_TOOLS_PREBUILT_ZIP_FILE_URL="file://$(rlocation io_bazel/$JAVA_TOOLS_PREBUILT_ZIP)"
     fi
+    # Remove the repo overrides that are set up some for Bazel CI workers.
+    inplace-sed "/override_repository=remote_java_tools=/d" "$TEST_TMPDIR/bazelrc"
+    inplace-sed "/override_repository=remote_java_tools_linux=/d" "$TEST_TMPDIR/bazelrc"
+    inplace-sed "/override_repository=remote_java_tools_windows=/d" "$TEST_TMPDIR/bazelrc"
+    inplace-sed "/override_repository=remote_java_tools_darwin=/d" "$TEST_TMPDIR/bazelrc"
 fi
 JAVA_TOOLS_PREBUILT_ZIP_FILE_URL=${JAVA_TOOLS_PREBUILT_ZIP_FILE_URL:-}
 

src/test/shell/bazel/bazel_java_test.sh

diff --git a/src/test/shell/bazel/bazel_java_test.sh b/src/test/shell/bazel/bazel_java_test.sh
index a05fdc1..22053c0 100755
--- a/src/test/shell/bazel/bazel_java_test.sh
+++ b/src/test/shell/bazel/bazel_java_test.sh
@@ -78,6 +78,11 @@
   else
     JAVA_TOOLS_PREBUILT_ZIP_FILE_URL="file://$(rlocation io_bazel/$JAVA_TOOLS_PREBUILT_ZIP)"
   fi
+  # Remove the repo overrides that are set up for some Bazel CI workers.
+  inplace-sed "/override_repository=remote_java_tools=/d" "$TEST_TMPDIR/bazelrc"
+  inplace-sed "/override_repository=remote_java_tools_linux=/d" "$TEST_TMPDIR/bazelrc"
+  inplace-sed "/override_repository=remote_java_tools_windows=/d" "$TEST_TMPDIR/bazelrc"
+  inplace-sed "/override_repository=remote_java_tools_darwin=/d" "$TEST_TMPDIR/bazelrc"
 fi
 JAVA_TOOLS_PREBUILT_ZIP_FILE_URL=${JAVA_TOOLS_PREBUILT_ZIP_FILE_URL:-}