commit 00afa791c42c0f925385f0e5ec426acf99eed665
author clementbera <clementbera@google.com> Thu Apr 25 08:01:31 2019 +0200
committer Clément Béra <clementbera@google.com> Thu Apr 25 13:15:49 2019 +0000
tree e3d935e46df69f8d2ae1b9548518f2382dedd6d6
parent 215a82f2d95d822ae243f508c978be4118515b05

Enable MultiJDK tests on Win/Mac

Change-Id: I567d6bb1798d4aef0b618dffe752b7f06d5666eb

src/test/java/com/android/tools/r8/TestRuntime.java

diff --git a/src/test/java/com/android/tools/r8/TestRuntime.java b/src/test/java/com/android/tools/r8/TestRuntime.java
index bd8a821..8e286eb 100644
--- a/src/test/java/com/android/tools/r8/TestRuntime.java
+++ b/src/test/java/com/android/tools/r8/TestRuntime.java
@@ -107,16 +107,10 @@
   }
 
   public static boolean isCheckedInJDK(CfVm jdk) {
-    // Non-linux checked-in jdk support has never been tested,
-    // so we pretend they do not exist.
-    if (!ToolHelper.isLinux()) {
-      return false;
-    }
     return CHECKED_IN_JDKS.containsKey(jdk);
   }
 
   public static Path getCheckInJDKPathFor(CfVm jdk) {
-    assumeTrue(ToolHelper.isLinux());
     return Paths.get("third_party", "openjdk")
         .resolve(CHECKED_IN_JDKS.get(jdk))
         .resolve(Paths.get("bin", "java"));