From 6b1f66cc3b101dfca291df28971e007b4cc9a1b8 Mon Sep 17 00:00:00 2001
From: Jakob Buchgraber <buchgr@google.com>
Date: Mon, 15 Apr 2019 06:42:51 -0700
Subject: [PATCH] fix bazel_with_jdk_test to properly depend on JAVABASE

Progress towards #8033

Closes #8042.

PiperOrigin-RevId: 243606106
---
 src/test/shell/bazel/BUILD                  |  2 ++
 src/test/shell/bazel/bazel_with_jdk_test.sh | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index 2ece60fa15dd2d..de4d62807de969 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -641,12 +641,14 @@ sh_test(
     name = "bazel_with_jdk_test",
     size = "medium",
     srcs = ["bazel_with_jdk_test.sh"],
+    args = ["$(JAVABASE)"],
     data = [
         ":test-deps",
         "//src:bazel",
         "@bazel_tools//tools/bash/runfiles",
     ],
     tags = ["no_windows"],
+    toolchains = ["@bazel_tools//tools/jdk:current_java_runtime"],
 )
 
 sh_test(
diff --git a/src/test/shell/bazel/bazel_with_jdk_test.sh b/src/test/shell/bazel/bazel_with_jdk_test.sh
index 7fc564307bc5f0..006a09b4604b92 100755
--- a/src/test/shell/bazel/bazel_with_jdk_test.sh
+++ b/src/test/shell/bazel/bazel_with_jdk_test.sh
@@ -64,6 +64,19 @@ if "$is_windows"; then
   export MSYS2_ARG_CONV_EXCL="*"
 fi
 
+if "$is_windows"; then
+  EXE_EXT=".exe"
+else
+  EXE_EXT=""
+fi
+
+javabase="$1"
+if [[ $javabase = external/* ]]; then
+  javabase=${javabase#external/}
+fi
+javabase="$(rlocation "${javabase}/bin/java${EXE_EXT}")"
+javabase=${javabase%/bin/java${EXE_EXT}}
+
 function bazel() {
   $(rlocation io_bazel/src/bazel) --bazelrc=$TEST_TMPDIR/bazelrc "$@"
   return $?
@@ -82,7 +95,7 @@ function set_up() {
   fgrep -v -- "--host_javabase" "$TEST_TMPDIR/bazelrc" > "$TEST_TMPDIR/bazelrc.new"
   mv "$TEST_TMPDIR/bazelrc.new" "$TEST_TMPDIR/bazelrc"
   # ... but ensure JAVA_HOME is set, so we can find a default --javabase
-  export JAVA_HOME="${bazel_javabase}"
+  export JAVA_HOME="${javabase}"
 }
 
 function test_bazel_uses_bundled_jdk() {