commit 1e9f0aa89dad38eeab0bd40e95e689be2ab6e5e5
author cushon <cushon@google.com> Fri Sep 07 01:16:05 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Fri Sep 07 01:17:40 2018 -0700
tree da54cb1f2733f49995c38f84cd7494598a3300b1
parent 4566a428c5317d87940aeacfd65f1018340e52b6

Fix more tests on JDK 9 and 10

PiperOrigin-RevId: 211938679

third_party/ijar/test/BUILD

diff --git a/third_party/ijar/test/BUILD b/third_party/ijar/test/BUILD
index 7ab7608..c30f939 100644
--- a/third_party/ijar/test/BUILD
+++ b/third_party/ijar/test/BUILD
@@ -9,10 +9,10 @@
     size = "enormous",
     srcs = ["ijar_test.sh"],
     args = [
-        "../local_jdk/bin/javac",
-        "../local_jdk/bin/java",
-        "../local_jdk/bin/jar",
-        "../local_jdk/bin/javap",
+        "$(JAVABASE)/bin/javac",
+        "$(JAVABASE)/bin/java",
+        "$(JAVABASE)/bin/jar",
+        "$(JAVABASE)/bin/javap",
         "$(location //third_party/ijar)",
         "$(location //tools/jdk:langtools)",
         # We assume unzip and zip to be on the path
@@ -49,6 +49,9 @@
     ],
     shard_count = 5,
     tags = ["zip"],
+    toolchains = [
+        "@bazel_tools//tools/jdk:current_java_runtime",
+    ],
 )
 
 sh_test(
@@ -273,11 +276,6 @@
         ":liblocal_and_anonymous_lib.jar",
         ":local_and_anonymous-interface.jar",
         ":module_info-interface.jar",
-        "//third_party/java/jdk/langtools:javac_jar",
-    ],
-    jvm_flags = [
-        # Simulates how Bazel invokes javac
-        "-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar)",
     ],
     tags = ["zip"],
     test_class = "IjarTests",