commit 7b4ad2acf9fedac356fbf15f0d99f2d722b2359d
author Rico Wind <ricow@google.com> Fri Sep 10 09:55:36 2021 +0200
committer Rico Wind <ricow@google.com> Fri Sep 10 08:18:49 2021 +0000
tree 087f6d710a98ff123168f9e9b50f4fc8ffc0b699
parent 0aaacaa94846968a82dac8004a0eb77cc4e55a33

Update test expectations for art 12.0.0

Pass api level for space in field name test

Update suppression for invoke custom crash that also happens on 9 and 10.

Bug: 120402963
Change-Id: Ib9499a09e3f4f768f7d2bc37d487740a57b404f6

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 11b41cc..fb37493 100644
--- a/src/test/java/com/android/tools/r8/R8RunExamplesAndroidOTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunExamplesAndroidOTest.java
@@ -85,6 +85,10 @@
               Version.V10_0_0,
               // TODO(120402963) Triage.
               ImmutableList.of("invokecustom-with-shrinking", "invokecustom2-with-shrinking"))
+          .put(
+              Version.V12_0_0,
+              // TODO(120402963) Triage.
+              ImmutableList.of("invokecustom-with-shrinking", "invokecustom2-with-shrinking"))
           .put(Version.DEFAULT, ImmutableList.of())
           .build();
 

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

diff --git a/src/test/java/com/android/tools/r8/RunExamplesAndroidOTest.java b/src/test/java/com/android/tools/r8/RunExamplesAndroidOTest.java
index 1dd7194..028b4b7 100644
--- a/src/test/java/com/android/tools/r8/RunExamplesAndroidOTest.java
+++ b/src/test/java/com/android/tools/r8/RunExamplesAndroidOTest.java
@@ -304,6 +304,11 @@
             ImmutableList.of(
                 // TODO(120402963): Triage.
                 "invokecustom", "invokecustom2"))
+        .put(
+            DexVm.Version.V12_0_0,
+            ImmutableList.of(
+                // TODO(120402963): Triage.
+                "invokecustom", "invokecustom2"))
         .put(DexVm.Version.DEFAULT, ImmutableList.of());
     failsOn = builder.build();
   }

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

diff --git a/src/test/java/com/android/tools/r8/jasmin/NameTestBase.java b/src/test/java/com/android/tools/r8/jasmin/NameTestBase.java
index fe04d25..f0d186f 100644
--- a/src/test/java/com/android/tools/r8/jasmin/NameTestBase.java
+++ b/src/test/java/com/android/tools/r8/jasmin/NameTestBase.java
@@ -109,12 +109,17 @@
     }
 
     if (validForArt) {
-      String artResult = runOnArtD8(jasminBuilder, mainClassName);
+      String artResult =
+          runOnArtD8(
+              jasminBuilder,
+              mainClassName,
+              o -> o.minApiLevel = ToolHelper.getMinApiLevelForDexVm());
       assertEquals(expectedResult, artResult);
     } else {
       // Make sure the compiler fails.
       try {
-        runOnArtD8(jasminBuilder, mainClassName);
+        runOnArtD8(
+            jasminBuilder, mainClassName, o -> o.minApiLevel = ToolHelper.getMinApiLevelForDexVm());
         fail("D8 should have rejected this case.");
       } catch (CompilationFailedException t) {
         assertTrue(t.getCause().getMessage().contains(expectedNameInFailingD8Message));
@@ -127,6 +132,7 @@
             mainClassName,
             options -> {
               options.itemFactory.setSkipNameValidationForTesting(true);
+              options.minApiLevel = ToolHelper.getMinApiLevelForDexVm();
             });
         fail("Art should have failed.");
       } catch (AssertionError e) {