commit cf52a57c941edacb35ed1e523743aa50e2d46a91
author Rico Wind <ricow@google.com> Tue Feb 22 11:33:49 2022 +0100
committer Rico Wind <ricow@google.com> Tue Feb 22 11:33:49 2022 +0100
tree 49e8d19c4721ff9b1cfd5055daa10670c12aaa9f
parent f752e5364b998b54abc9b23d08a011cfca30def0

Disable failing tests on art 13

The invokecustom tests are already failing on 12, see b/120402963

The art test failure is tracked in b/220821265

Bug: 220821265
Bug: 120402963
Change-Id: I3a6e97fef84d1dffa6311e1c4dd9e36f35a9af6e

src/test/java/com/android/tools/r8/R8RunExamplesAndroidOTest.java

diff --git a/src/test/java/com/android/tools/r8/R8RunExamplesAndroidOTest.java b/src/test/java/com/android/tools/r8/R8RunExamplesAndroidOTest.java
index f695dbb..ec8d314 100644
--- a/src/test/java/com/android/tools/r8/R8RunExamplesAndroidOTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunExamplesAndroidOTest.java
@@ -89,6 +89,10 @@
               Version.V12_0_0,
               // TODO(120402963) Triage.
               ImmutableList.of("invokecustom-with-shrinking", "invokecustom2-with-shrinking"))
+          .put(
+              Version.V13_MASTER,
+              // TODO(120402963) Triage.
+              ImmutableList.of("invokecustom-with-shrinking", "invokecustom2-with-shrinking"))
           .put(Version.DEFAULT, ImmutableList.of())
           .build();
 

src/test/java/com/android/tools/r8/jasmin/Regress65007724.java

diff --git a/src/test/java/com/android/tools/r8/jasmin/Regress65007724.java b/src/test/java/com/android/tools/r8/jasmin/Regress65007724.java
index 1eb0586..cdc5b63 100644
--- a/src/test/java/com/android/tools/r8/jasmin/Regress65007724.java
+++ b/src/test/java/com/android/tools/r8/jasmin/Regress65007724.java
@@ -3,11 +3,29 @@
 // BSD-style license that can be found in the LICENSE file.
 package com.android.tools.r8.jasmin;
 
-import static org.junit.Assert.assertEquals;
-
+import com.android.tools.r8.D8TestRunResult;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.ToolHelper.DexVm.Version;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
+@RunWith(Parameterized.class)
 public class Regress65007724 extends JasminTestBase {
+
+  private final TestParameters parameters;
+
+  public Regress65007724(TestParameters parameters) {
+    this.parameters = parameters;
+  }
+
+  @Parameters(name = "{0}")
+  public static TestParametersCollection data() {
+    return getTestParameters().withDexRuntimes().withAllApiLevels().build();
+  }
+
   @Test
   public void testThat16BitsIndexAreAllowed() throws Exception {
     JasminBuilder builder = new JasminBuilder();
@@ -28,8 +46,16 @@
         "invokevirtual java/io/PrintStream/print(Ljava/lang/String;)V",
         "return");
 
-    String expected = runOnJava(builder, clazz.name);
-    String artResult = runOnArtD8(builder, clazz.name);
-    assertEquals(expected, artResult);
+    D8TestRunResult d8TestRunResult =
+        testForD8(parameters.getBackend())
+            .setMinApi(parameters.getApiLevel())
+            .addProgramClassFileData(builder.buildClasses())
+            .run(parameters.getRuntime(), clazz.name);
+    if (parameters.getDexRuntimeVersion().isEqualTo(Version.V13_MASTER)) {
+      // See b/220821265
+      d8TestRunResult.assertFailure();
+    } else {
+      d8TestRunResult.assertSuccessWithOutput("Hello World!");
+    }
   }
 }