Bazel: Fix tests execution on Java 11

To support tests execution on Java 11, without using Java 11 toolchain
additional parameters must be passed. The use case is building on host
Java 11. This is needed to bump host Java version to Java 11 on Gerrit
CI.

Test Plan:

1. Install Java 11 (only)

  $ java -fullversion
  openjdk full version "11.0.5+10-post-Debian-1deb10u1"

2. Execute tests and confirm that all tests are passing

  $ bazelisk test //...

Change-Id: I97c244052f353eb61053a5f4f36a5ee646b8be9c
This commit is contained in:
David Ostrovsky
2019-11-23 21:06:13 -08:00
parent bf3f08b4b2
commit dcd81d68f5
2 changed files with 2 additions and 13 deletions

View File

@@ -2,8 +2,6 @@ load("@rules_java//java:defs.bzl", "java_library")
package(default_visibility = ["//visibility:public"])
POST_JDK8_DEPS = [":javax-activation"]
java_library(
name = "javax-activation",
testonly = True,
@@ -16,9 +14,5 @@ java_library(
testonly = True,
data = ["//lib:LICENSE-Apache2.0"],
exports = ["@greenmail//jar"],
runtime_deps = select({
"//:java11": POST_JDK8_DEPS,
"//:java_next": POST_JDK8_DEPS,
"//conditions:default": [],
}),
runtime_deps = [":javax-activation"],
)

View File

@@ -79,12 +79,7 @@ def junit_tests(name, srcs, **kwargs):
srcs = srcs,
outname = s_name,
)
jvm_flags = kwargs.get("jvm_flags", [])
jvm_flags = jvm_flags + select({
"//:java11": POST_JDK8_OPTS,
"//:java_next": POST_JDK8_OPTS,
"//conditions:default": [],
})
jvm_flags = kwargs.get("jvm_flags", []) + POST_JDK8_OPTS
java_test(
name = name,
test_class = s_name,