commit 04e9abffbd795aa00b263c8ac8c556aa13be372b
author Mathias Rav <mathiasr@google.com> Wed Mar 14 15:06:05 2018 +0100
committer Mathias Rav <mathiasr@google.com> Wed Mar 14 15:06:05 2018 +0100
tree 7ce2b041bc2b42f149afe392c3faf6dd7f173b51
parent 12ab48cdbd46706f3fac6b84c475ac5acc071fa2

Only run MethodHandleTest on DexVm.ART_DEFAULT

This fixes the test failure on my local machine,
so it should fix the buildbot too.

Change-Id: I537ba05c658cbfd83f3aad2e887eebca5c4997d5

src/test/java/com/android/tools/r8/cf/MethodHandleTestRunner.java

diff --git a/src/test/java/com/android/tools/r8/cf/MethodHandleTestRunner.java b/src/test/java/com/android/tools/r8/cf/MethodHandleTestRunner.java
index 3870598..ba25396 100644
--- a/src/test/java/com/android/tools/r8/cf/MethodHandleTestRunner.java
+++ b/src/test/java/com/android/tools/r8/cf/MethodHandleTestRunner.java
@@ -13,6 +13,7 @@
 import com.android.tools.r8.R8Command;
 import com.android.tools.r8.R8Command.Builder;
 import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.ToolHelper.DexVm;
 import com.android.tools.r8.ToolHelper.ProcessResult;
 import com.android.tools.r8.origin.Origin;
 import com.android.tools.r8.utils.AndroidApiLevel;
@@ -60,12 +61,16 @@
 
     ProcessResult runCf =
         ToolHelper.runJava(outCf, CLASS.getCanonicalName(), ldc ? "error" : "exception");
+    assertEquals(runInput.toString(), runCf.toString());
+    // TODO(mathiasr): Once we include a P runtime, change this to "P and above".
+    if (ToolHelper.getDexVm() != DexVm.ART_DEFAULT) {
+      return;
+    }
     ProcessResult runDex =
         ToolHelper.runArtRaw(
             outDex.toString(),
             CLASS.getCanonicalName(),
             cmd -> cmd.appendProgramArgument(ldc ? "pass" : "exception"));
-    assertEquals(runInput.toString(), runCf.toString());
     // Only compare stdout and exitCode since dex2oat prints to stderr.
     if (runInput.exitCode != runDex.exitCode) {
       System.out.println(runDex.stderr);