commit 190440afd5c304438851011526ebe11bcde62cce
author Jinseong Jeon <jsjeon@google.com> Sat Oct 19 21:25:03 2019 -0700
committer Jinseong Jeon <jsjeon@google.com> Sat Oct 19 21:25:03 2019 -0700
tree 5ae34343b01f42ceb258636ec3ace36b2fc28b7a
parent c722092ee29755c5ca9c4134b824482d1c84421f

Reattempt to disable HelloWorldCompiledOnArtTest on Windows.

Change-Id: I924febe48fe8c64e6f57b5bd6f0ffb270b2c16d2

src/test/java/com/android/tools/r8/desugar/corelib/HelloWorldCompiledOnArtTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/corelib/HelloWorldCompiledOnArtTest.java b/src/test/java/com/android/tools/r8/desugar/corelib/HelloWorldCompiledOnArtTest.java
index 8419864..044f075 100644
--- a/src/test/java/com/android/tools/r8/desugar/corelib/HelloWorldCompiledOnArtTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/corelib/HelloWorldCompiledOnArtTest.java
@@ -39,6 +39,7 @@
 
   @BeforeClass
   public static void compilePathBackport() throws Exception {
+    assumeTrue("JDK8 is not checked-in on Windows", !ToolHelper.isWindows());
     pathMock = getStaticTemp().newFolder("PathMock").toPath();
     ProcessResult processResult =
         ToolHelper.runJavac(
@@ -57,7 +58,6 @@
 
   @Parameters(name = "{0}")
   public static TestParametersCollection data() {
-    assumeTrue(!ToolHelper.isWindows());
     return getTestParameters()
         .withDexRuntimesStartingFromIncluding(Version.V7_0_0)
         .withApiLevelsStartingAtIncluding(AndroidApiLevel.L)