commit 6af48bb6bfab995e7c927deea99e40b5405fbe6f
author Søren Gjesse <sgjesse@google.com> Fri Nov 15 14:23:11 2019 +0100
committer Søren Gjesse <sgjesse@google.com> Sun Nov 17 09:57:10 2019 +0000
tree 13bd6db165d6cdbc8e3029c76ecc1ae6327d698a
parent 836a090e34a484d3416d1f8f66f18e3a32b4695e

Refactor Java11R8BootstrapTest slightly

Change-Id: I1638426de341f00e23be1c9ba2cda9e9dbd152d1

src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/Java11R8BootstrapTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/Java11R8BootstrapTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/Java11R8BootstrapTest.java
index 50d0125..1730e78 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/Java11R8BootstrapTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/Java11R8BootstrapTest.java
@@ -11,6 +11,7 @@
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.TestRuntime;
 import com.android.tools.r8.TestRuntime.CfRuntime;
 import com.android.tools.r8.TestRuntime.CfVm;
 import com.android.tools.r8.ToolHelper;
@@ -52,7 +53,7 @@
 
   @Parameters(name = "{0}")
   public static TestParametersCollection data() {
-    return getTestParameters().withCfRuntime(CfVm.JDK11).build();
+    return getTestParameters().withCfRuntimes().build();
   }
 
   @BeforeClass
@@ -96,12 +97,12 @@
     Path prevGeneratedJar = null;
     String prevRunResult = null;
     for (Path jar : jarsToCompare()) {
+      // All jars except ToolHelper.R8_WITH_RELOCATED_DEPS_JAR are compiled for JDK11.
+      TestRuntime runtime = jar == ToolHelper.R8_WITH_RELOCATED_DEPS_JAR
+          ? parameters.getRuntime()
+          : CfRuntime.JDK11;
       Path generatedJar =
-          testForExternalR8(
-                  Backend.CF,
-                  jar == ToolHelper.R8_WITH_RELOCATED_DEPS_JAR
-                      ? CfRuntime.SYSTEM_JDK
-                      : CfRuntime.JDK11)
+          testForExternalR8(Backend.CF, runtime)
               .useProvidedR8(jar)
               .addProgramFiles(Paths.get(ToolHelper.EXAMPLES_BUILD_DIR, "hello" + JAR_EXTENSION))
               .addKeepRules(HELLO_KEEP)
@@ -127,10 +128,12 @@
   @Test
   public void testR8() throws Exception {
     Assume.assumeTrue(!ToolHelper.isWindows());
+    Assume.assumeTrue(parameters.isCfRuntime());
+    Assume.assumeTrue(CfVm.JDK11 == parameters.getRuntime().asCf().getVm());
     Path prevGeneratedJar = null;
     for (Path jar : jarsToCompare()) {
       Path generatedJar =
-          testForExternalR8(Backend.CF, CfRuntime.JDK11)
+          testForExternalR8(Backend.CF, parameters.getRuntime())
               .useProvidedR8(jar)
               .addProgramFiles(Paths.get(ToolHelper.EXAMPLES_BUILD_DIR, "hello" + JAR_EXTENSION))
               .addKeepRuleFiles(MAIN_KEEP)