diff options
Diffstat (limited to 'src/test/shell/testenv.sh')
| -rwxr-xr-x | src/test/shell/testenv.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh index 9de4521fea..805304a333 100755 --- a/src/test/shell/testenv.sh +++ b/src/test/shell/testenv.sh @@ -60,7 +60,7 @@ if is_windows; then fi # Make the command "bazel" available for tests. -PATH_TO_BAZEL_BIN=$(rlocation io_bazel/src/bazel) +PATH_TO_BAZEL_BIN=$(rlocation io_bazel/src/bazel_with_jdk) PATH_TO_BAZEL_WRAPPER="$(dirname $(rlocation io_bazel/src/test/shell/bin/bazel))" # Convert PATH_TO_BAZEL_WRAPPER to Unix path style on Windows, because it will be # added into PATH. There's problem if PATH=C:/msys64/usr/bin:/usr/local, @@ -266,8 +266,6 @@ function setup_bazelrc() { cat >$TEST_TMPDIR/bazelrc <<EOF # Set the user root properly for this test invocation. startup --output_user_root=${bazel_root} -# Set the correct javabase from the outer bazel invocation. -startup --host_javabase=${bazel_javabase} # Print all progress messages because we regularly grep the output in tests. common --show_progress_rate_limit=-1 |