Make turbine tests more compatible with Windows

See bazelbuild/bazel#4165.

PiperOrigin-RevId: 177254510

2 files changed, 13 insertions, 13 deletions

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 8a7e52f6fd..63646135a7 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
@@ -23,6 +23,7 @@ import com.google.common.io.ByteStreams;
 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;
@@ -73,7 +74,7 @@ public abstract class AbstractJavacTurbineCompilationTest {
         .setOutput(output.toString())
         .setTempDir(tempdir.toString())
         .addBootClassPathEntries(
-            Splitter.on(':')
+            Splitter.on(File.pathSeparatorChar)
                 .splitToList(System.getProperty("sun.boot.class.path"))
                 .stream()
                 .map(e -> Paths.get(e).toAbsolutePath().toString())
diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java
index 6c24a732d4..3d730d9793 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java
@@ -39,6 +39,7 @@ import com.sun.tools.javac.file.JavacFileManager;
 import com.sun.tools.javac.util.Context;
 import java.io.BufferedInputStream;
 import java.io.BufferedWriter;
+import java.io.File;
 import java.io.IOError;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -86,6 +87,10 @@ import org.objectweb.asm.util.TraceClassVisitor;
 @RunWith(JUnit4.class)
 public class JavacTurbineTest extends AbstractJavacTurbineCompilationTest {
 
+  private static final ImmutableList<String> HOST_CLASSPATH =
+      ImmutableList.copyOf(
+          Splitter.on(File.pathSeparatorChar).split(System.getProperty("java.class.path")));
+
   @Test
   public void hello() throws Exception {
     addSourceLines(
@@ -217,10 +222,8 @@ public class JavacTurbineTest extends AbstractJavacTurbineCompilationTest {
         "}");
 
     optionsBuilder.addProcessors(ImmutableList.of(MyProcessor.class.getName()));
-    optionsBuilder.addProcessorPathEntries(
-        ImmutableList.copyOf(Splitter.on(':').split(System.getProperty("java.class.path"))));
-    optionsBuilder.addClassPathEntries(
-        ImmutableList.copyOf(Splitter.on(':').split(System.getProperty("java.class.path"))));
+    optionsBuilder.addProcessorPathEntries(HOST_CLASSPATH);
+    optionsBuilder.addClassPathEntries(HOST_CLASSPATH);
 
     compile();
 
@@ -758,10 +761,8 @@ public class JavacTurbineTest extends AbstractJavacTurbineCompilationTest {
         "}");
 
     optionsBuilder.addProcessors(ImmutableList.of(MyBadEncodingProcessor.class.getName()));
-    optionsBuilder.addProcessorPathEntries(
-        ImmutableList.copyOf(Splitter.on(':').split(System.getProperty("java.class.path"))));
-    optionsBuilder.addClassPathEntries(
-        ImmutableList.copyOf(Splitter.on(':').split(System.getProperty("java.class.path"))));
+    optionsBuilder.addProcessorPathEntries(HOST_CLASSPATH);
+    optionsBuilder.addClassPathEntries(HOST_CLASSPATH);
 
     optionsBuilder.addSources(ImmutableList.copyOf(Iterables.transform(sources, TO_STRING)));
     try (StringWriter sw = new StringWriter();
@@ -935,8 +936,7 @@ public class JavacTurbineTest extends AbstractJavacTurbineCompilationTest {
   public void processorReadsNonexistantFile() throws Exception {
     addSourceLines("Hello.java", "@Deprecated class Hello {}");
     optionsBuilder.addProcessors(ImmutableList.of(NoSuchFileProcessor.class.getName()));
-    optionsBuilder.addProcessorPathEntries(
-        ImmutableList.copyOf(Splitter.on(':').split(System.getProperty("java.class.path"))));
+    optionsBuilder.addProcessorPathEntries(HOST_CLASSPATH);
     optionsBuilder.addSources(ImmutableList.copyOf(Iterables.transform(sources, TO_STRING)));
 
     StringWriter errOutput = new StringWriter();
@@ -1278,8 +1278,7 @@ public class JavacTurbineTest extends AbstractJavacTurbineCompilationTest {
         "}");
 
     optionsBuilder.addProcessors(ImmutableList.of(SimpleProcessor.class.getName()));
-    optionsBuilder.addProcessorPathEntries(
-        ImmutableList.copyOf(Splitter.on(':').split(System.getProperty("java.class.path"))));
+    optionsBuilder.addProcessorPathEntries(HOST_CLASSPATH);
     optionsBuilder.addAllJavacOpts(Arrays.asList("-Xlint:deprecation"));
     optionsBuilder.addSources(ImmutableList.copyOf(Iterables.transform(sources, TO_STRING)));