commit b348e482edb4bf4d238c1bc9169588beb671b8cf
author Rico Wind <ricow@google.com> Tue Mar 19 15:56:35 2019 +0100
committer Rico Wind <ricow@google.com> Tue Mar 19 15:56:35 2019 +0100
tree 6f6055ce459a3d8d1847439f28338ae80274551b
parent a0e7f2a313e71a9730462435da4027789572f55a

Only run MainDexListTests on the normal cf (i.e., once)

We are currently running these on all bots, and it is very slow

Change-Id: Ica46af8997d5063109cb62137147276ee9a3ed1e

src/test/java/com/android/tools/r8/maindexlist/MainDexListTests.java

diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexListTests.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexListTests.java
index 5d4f802..ef53f73 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexListTests.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexListTests.java
@@ -20,6 +20,8 @@
 import com.android.tools.r8.R8Command;
 import com.android.tools.r8.StringResource;
 import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
 import com.android.tools.r8.ToolHelper;
 import com.android.tools.r8.dex.ApplicationWriter;
 import com.android.tools.r8.dex.Constants;
@@ -79,6 +81,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -95,7 +98,11 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
+@RunWith(Parameterized.class)
 public class MainDexListTests extends TestBase {
 
   private static final int MAX_METHOD_COUNT = Constants.U16BIT_MAX;
@@ -106,6 +113,15 @@
   private static final int MANY_CLASSES_MULTI_DEX_METHODS_PER_CLASS = 10;
   private static List<String> MANY_CLASSES;
 
+  @Parameters
+  public static TestParametersCollection data() {
+    return getTestParameters().withCfRuntimes().build();
+  }
+
+  public MainDexListTests(TestParameters parameters) {
+    // We ignore the paramters, but only run once instead of running on every vm
+  }
+
   interface Runner {
     void run(DiagnosticsHandler handler) throws Throwable;
   }
@@ -117,6 +133,9 @@
   // Generate the test applications in a @BeforeClass method, as they are used by several tests.
   @BeforeClass
   public static void generateTestApplications() throws Throwable {
+    if (data().stream().count() == 0) {
+      return;
+    }
     ImmutableList.Builder<String> builder = ImmutableList.builder();
     for (int i = 0; i < MANY_CLASSES_COUNT; ++i) {
       String pkg = i % 2 == 0 ? "a" : "b";