Update bazel_java_test.sh

bazelbuild · Nov 24, 2023 · cd658d5 · cd658d5
1 parent 75f3fa1
commit cd658d5
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/src/test/shell/bazel/bazel_java_test.sh b/src/test/shell/bazel/bazel_java_test.sh
@@ -60,33 +60,27 @@ JAVA_TOOLCHAIN="@bazel_tools//tools/jdk:toolchain"
 JAVA_TOOLCHAIN_TYPE="@bazel_tools//tools/jdk:toolchain_type"
 
 RULES_JAVA_REPO_NAME=$(cat "$(rlocation io_bazel/src/test/shell/bazel/RULES_JAVA_REPO_NAME)")
-echo "RULES_JAVA_REPO_NAME=${RULES_JAVA_REPO_NAME}"
-JAVA_TOOLS_REPO_PREFIX="${RULES_JAVA_REPO_NAME}~toolchains"
-echo "JAVA_TOOLS_REPO_PREFIX=${JAVA_TOOLS_REPO_PREFIX}"
+JAVA_TOOLS_REPO_PREFIX="${RULES_JAVA_REPO_NAME}~toolchains~"
 
 JAVA_TOOLS_ZIP="$1"; shift
 if [[ "${JAVA_TOOLS_ZIP}" != "released" ]]; then
  JAVA_TOOLS_ZIP_FILE="$(rlocation "io_bazel/${JAVA_TOOLS_ZIP}")"
- echo "JAVA_TOOLS_ZIP_FILE=${JAVA_TOOLS_ZIP_FILE}"
- # Unzip the java_tools zip file to a temporary directory.
  JAVA_TOOLS_DIR="$TEST_TMPDIR/_java_tools"
- echo "JAVA_TOOLS_DIR=${JAVA_TOOLS_DIR}"
  unzip -q "${JAVA_TOOLS_ZIP_FILE}" -d "$JAVA_TOOLS_DIR"
  touch "$JAVA_TOOLS_DIR/WORKSPACE"
- add_to_bazelrc "build --override_repository=${JAVA_TOOLS_REPO_PREFIX}~remote_java_tools=${JAVA_TOOLS_DIR}"
+ add_to_bazelrc "build --override_repository=${JAVA_TOOLS_REPO_PREFIX}remote_java_tools=${JAVA_TOOLS_DIR}"
 fi
 
 JAVA_TOOLS_PREBUILT_ZIP="$1"; shift
 if [[ "${JAVA_TOOLS_PREBUILT_ZIP}" != "released" ]]; then
  JAVA_TOOLS_PREBUILT_ZIP_FILE="$(rlocation "io_bazel/${JAVA_TOOLS_PREBUILT_ZIP}")"
- # Unzip the java_tools_prebuilt zip file to a temporary directory.
  JAVA_TOOLS_PREBUILT_DIR="$TEST_TMPDIR/_java_tools_prebuilt"
  unzip -q "${JAVA_TOOLS_PREBUILT_ZIP_FILE}" -d "$JAVA_TOOLS_PREBUILT_DIR"
  touch "$JAVA_TOOLS_PREBUILT_DIR/WORKSPACE"
- add_to_bazelrc "build --override_repository=${JAVA_TOOLS_REPO_PREFIX}~remote_java_tools_linux=${JAVA_TOOLS_PREBUILT_DIR}"
- add_to_bazelrc "build --override_repository=${JAVA_TOOLS_REPO_PREFIX}~remote_java_tools_windows=${JAVA_TOOLS_PREBUILT_DIR}"
- add_to_bazelrc "build --override_repository=${JAVA_TOOLS_REPO_PREFIX}~remote_java_tools_darwin_x86_64=${JAVA_TOOLS_PREBUILT_DIR}"
- add_to_bazelrc "build --override_repository=${JAVA_TOOLS_REPO_PREFIX}~remote_java_tools_arm64=${JAVA_TOOLS_PREBUILT_DIR}"
+ add_to_bazelrc "build --override_repository=${JAVA_TOOLS_REPO_PREFIX}remote_java_tools_linux=${JAVA_TOOLS_PREBUILT_DIR}"
+ add_to_bazelrc "build --override_repository=${JAVA_TOOLS_REPO_PREFIX}remote_java_tools_windows=${JAVA_TOOLS_PREBUILT_DIR}"
+ add_to_bazelrc "build --override_repository=${JAVA_TOOLS_REPO_PREFIX}remote_java_tools_darwin_x86_64=${JAVA_TOOLS_PREBUILT_DIR}"
+ add_to_bazelrc "build --override_repository=${JAVA_TOOLS_REPO_PREFIX}remote_java_tools_arm64=${JAVA_TOOLS_PREBUILT_DIR}"
 fi
 
 if [[ $# -gt 0 ]]; then