Skip to content

Commit cd86002

Browse files
committed
1 parent 94b810f commit cd86002

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

src/test/shell/bazel/bazel_java_test.sh

+7
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,13 @@ if [[ $# -gt 0 ]]; then
9797
JAVA_RUNTIME_VERSION="$1"; shift
9898
add_to_bazelrc "build --java_runtime_version=${JAVA_RUNTIME_VERSION}"
9999
add_to_bazelrc "build --tool_java_runtime_version=${JAVA_RUNTIME_VERSION}"
100+
if [[ "${JAVA_RUNTIME_VERSION}" == 8 ]]; then
101+
JAVA_TOOLCHAIN="@bazel_tools//tools/jdk:toolchain_java8"
102+
elif [[ "${JAVA_RUNTIME_VERSION}" == 11 ]]; then
103+
JAVA_TOOLCHAIN="@bazel_tools//tools/jdk:toolchain_java11"
104+
else
105+
JAVA_TOOLCHAIN="@bazel_tools//tools/jdk:toolchain_jdk_${JAVA_RUNTIME_VERSION}"
106+
fi
100107
fi
101108

102109
export TESTENV_DONT_BAZEL_CLEAN=1
22.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)