commit 4c912119af8e3d21f70af8362d41cfff1db2bcc9
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Feb 19 15:48:02 2021 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Fri Feb 19 15:48:02 2021 +0100
tree 9ba13e6451bafcc0ffefbcdd0653244b57532a39
parent 497624963fb1021fc1e11bfe80737b44338808f2

Explicitly ignore tests on Windows after removing @RunWith(VmTestRunner.class)

Change-Id: Ibf0d80385e140f490b0a45dd0d83cb48d981bc4e

src/test/java/com/android/tools/r8/maindexlist/b72312389/B72312389.java

diff --git a/src/test/java/com/android/tools/r8/maindexlist/b72312389/B72312389.java b/src/test/java/com/android/tools/r8/maindexlist/b72312389/B72312389.java
index b32c0be..05e769d 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/b72312389/B72312389.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/b72312389/B72312389.java
@@ -6,6 +6,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
 
 import com.android.tools.r8.BaseCommand;
 import com.android.tools.r8.CompatProguardCommandBuilder;
@@ -18,7 +19,6 @@
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.ToolHelper;
 import com.android.tools.r8.ToolHelper.DexVm;
-import com.android.tools.r8.VmTestRunner;
 import com.android.tools.r8.origin.Origin;
 import com.android.tools.r8.utils.AndroidApiLevel;
 import com.android.tools.r8.utils.Box;
@@ -28,7 +28,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 public class B72312389 extends TestBase {
   // TODO(120884788): Remove this when default is true.
@@ -52,6 +51,7 @@
 
   @Test
   public void testGenerateMainDexList() throws Exception {
+    assumeFalse(ToolHelper.isWindows());
     CollectingDiagnosticHandler diagnostics = new CollectingDiagnosticHandler();
     GenerateMainDexListCommand.Builder builder = GenerateMainDexListCommand.builder(diagnostics);
     buildInstrumentationTestCaseApplication(builder);
@@ -69,6 +69,7 @@
 
   @Test
   public void testR8ForceProguardCompatibility() throws Exception {
+    assumeFalse(ToolHelper.isWindows());
     Box<String> mainDexList = new Box<>();
     // Build a app with a class extending InstrumentationTestCase and including both the junit
     // and the Android library.
@@ -97,6 +98,7 @@
 
   @Test
   public void testR8() throws Exception {
+    assumeFalse(ToolHelper.isWindows());
     testForR8(Backend.DEX)
         .apply(b -> buildInstrumentationTestCaseApplication(b.getBuilder()))
         .setMinApi(AndroidApiLevel.B)