diff options
| author |  cushon <cushon@google.com> | 2018-05-14 15:14:07 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-14 15:16:00 -0700 |
| commit | a6ee1ee9c4b4309b721f73a4b3de3f3432a89d6e (patch) | |
| tree | 484ded42772342ac21e23f9299fc10bffb16eccf | |
| parent | 2c493e8a2132d54f4b2fb8046f6bcef11e92cd22 (diff) | |
Set JAVA_HOME for bazel_with_jdk_test
The local JDK is now the default --javabase and needs to be available for these
tests, see:
https://github.com/bazelbuild/bazel/commit/849df36c5ad31ebe8791c4228321c38c6d0ae56c
PiperOrigin-RevId: 196575260
| -rwxr-xr-x | src/test/shell/bazel/bazel_with_jdk_test.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/shell/bazel/bazel_with_jdk_test.sh b/src/test/shell/bazel/bazel_with_jdk_test.sh index d4a51f391c..98c022345d 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 @@ function set_up() { # 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() { |