commit aad94d9c04d96e68e6afc184c6c541bb0e7bb7f4
author Liam Miller-Cushon <cushon@google.com> Mon May 14 10:14:05 2018 -0700
committer Liam Miller-Cushon <cushon@google.com> Mon May 14 10:14:05 2018 -0700
tree b92fa44f227bfc44724f7a84483b203b116b3b94
parent a1ef999612dc16e243cf113f575c77d6ba516bed

Set JAVA_HOME for bazel_with_jdk_test

Change-Id: I241421d1514ffeed1a203ab85dc203ae41a72903

src/test/shell/bazel/bazel_with_jdk_test.sh

diff --git a/src/test/shell/bazel/bazel_with_jdk_test.sh b/src/test/shell/bazel/bazel_with_jdk_test.sh
index d4a51f3..98c0223 100755
--- a/src/test/shell/bazel/bazel_with_jdk_test.sh
+++ b/src/test/shell/bazel/bazel_with_jdk_test.sh
@@ -38,6 +38,8 @@
   # actually using the bundled one. Remove it.
   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}"
 }
 
 function cleanup() {