commit d4f8fe876ae6789870eac7136f3b282e971bf452
author Søren Gjesse <sgjesse@google.com> Wed Aug 09 13:00:58 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 09 13:00:58 2017 +0000
tree e5bfdba0f864d66ffc2923b8df9c0ba07b8623a9
parent e91db445efc82224572081b83ed1cd903fa1a932
parent 8687199bd77bfec5edfa39f5175ab7d8762baca7

Merge "Update test to run on older Art versions"

src/test/java/com/android/tools/r8/regress/b63935662/Regress63935662.java

diff --git a/src/test/java/com/android/tools/r8/regress/b63935662/Regress63935662.java b/src/test/java/com/android/tools/r8/regress/b63935662/Regress63935662.java
index 70d4efc..8d0e667 100644
--- a/src/test/java/com/android/tools/r8/regress/b63935662/Regress63935662.java
+++ b/src/test/java/com/android/tools/r8/regress/b63935662/Regress63935662.java
@@ -7,9 +7,9 @@
 import com.android.tools.r8.R8Command;
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.ToolHelper;
-import com.android.tools.r8.ToolHelper.DexVm;
 import com.android.tools.r8.dex.Constants;
 import com.android.tools.r8.utils.AndroidApp;
+import com.android.tools.r8.utils.OffOrAuto;
 import java.nio.file.Path;
 import org.junit.Assert;
 import org.junit.Test;
@@ -17,17 +17,15 @@
 public class Regress63935662 extends TestBase {
 
   void run(AndroidApp app, Class mainClass) throws Exception {
-    if (!ToolHelper.getDexVm().isNewerThan(DexVm.ART_6_0_1)) {
-      return;
-    }
-    Path proguardConfig = writeTextToTempFile(keepMainProguardConfiguration(mainClass, true, false));
+    Path proguardConfig =
+        writeTextToTempFile(keepMainProguardConfiguration(mainClass, true, false));
     R8Command command =
         ToolHelper.prepareR8CommandBuilder(app)
             .addProguardConfigurationFiles(proguardConfig)
-            .setMinApiLevel(Constants.ANDROID_N_API)
+            .setMinApiLevel(Constants.ANDROID_L_API)
             .build();
     String resultFromJava = runOnJava(mainClass);
-    app = ToolHelper.runR8(command);
+    app = ToolHelper.runR8(command, options -> options.interfaceMethodDesugaring = OffOrAuto.Auto);
     String resultFromArt = runOnArt(app, mainClass);
     Assert.assertEquals(resultFromJava, resultFromArt);
   }