Make some tests compatible with JDK 9

PiperOrigin-RevId: 185003013

3 files changed, 14 insertions, 11 deletions

diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/testing/InMemoryJavaFileManager.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/testing/InMemoryJavaFileManager.java
index 3c9e1d6265..31de9832a9 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/testing/InMemoryJavaFileManager.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/testing/InMemoryJavaFileManager.java
@@ -19,6 +19,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 import com.google.auto.value.AutoValue;
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Joiner;
+import com.google.common.base.StandardSystemProperty;
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.java.bazel.JavaBuilderConfig;
 import com.sun.tools.javac.api.JavacTool;
@@ -155,9 +156,16 @@ public class InMemoryJavaFileManager {
 
     public CompilationResult compile() throws IOException {
       if (output == null) {
-        Path root =
-            sources.iterator().next().getFileSystem().getRootDirectories().iterator().next();
-        output = Files.createTempDirectory(root, "classes");
+        Path tmp =
+            sources
+                .iterator()
+                .next()
+                .getFileSystem()
+                .getPath(StandardSystemProperty.JAVA_IO_TMPDIR.value());
+        if (!Files.exists(tmp)) {
+          Files.createDirectory(tmp);
+        }
+        output = Files.createTempDirectory(tmp, "classes");
         Files.createDirectories(output);
       }
       DiagnosticCollector<JavaFileObject> diagnosticCollector = new DiagnosticCollector<>();
diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/AbstractJavacTurbineCompilationTest.java b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/AbstractJavacTurbineCompilationTest.java
index 63646135a7..1937a2b193 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/AbstractJavacTurbineCompilationTest.java
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/AbstractJavacTurbineCompilationTest.java
@@ -18,12 +18,11 @@ import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.truth.Truth.assertThat;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import com.google.common.base.Splitter;
 import com.google.common.io.ByteStreams;
+import com.google.devtools.build.java.bazel.JavacBootclasspath;
 import com.google.devtools.build.java.turbine.javac.JavacTurbine.Result;
 import com.google.turbine.options.TurbineOptions;
 import java.io.BufferedWriter;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -32,7 +31,6 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Enumeration;
@@ -74,11 +72,7 @@ public abstract class AbstractJavacTurbineCompilationTest {
         .setOutput(output.toString())
         .setTempDir(tempdir.toString())
         .addBootClassPathEntries(
-            Splitter.on(File.pathSeparatorChar)
-                .splitToList(System.getProperty("sun.boot.class.path"))
-                .stream()
-                .map(e -> Paths.get(e).toAbsolutePath().toString())
-                .collect(toImmutableList()))
+            JavacBootclasspath.asPaths().stream().map(Path::toString).collect(toImmutableList()))
         .setOutputDeps(outputDeps.toString())
         .addAllJavacOpts(Arrays.asList("-source", "8", "-target", "8"))
         .setTargetLabel("//test")
diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD
index 50082fe6fb..a77f3a32fc 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD
@@ -5,6 +5,7 @@ java_library(
     testonly = 1,
     srcs = ["AbstractJavacTurbineCompilationTest.java"],
     deps = [
+        "//src/java_tools/buildjar/java/com/google/devtools/build/java/bazel:JavacBootclasspath",
         "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac:javac_turbine",
         "//src/main/protobuf:deps_java_proto",
         "//third_party:asm",