commit d274e02d263ef2b5483853459046dabc2d46594c
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Apr 14 07:35:10 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed Apr 14 05:38:55 2021 +0000
tree 40999eb5faea81f4b387e76388126dfc554af9ba
parent 23964b1f670c52c715dd0533594154aedaf21fac

Update expectations for Art tests using Class.forName

Change-Id: Ia14e6ce106404fca1d4bf182a09e87b563901362

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

diff --git a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
index 4b095bb..95198ec 100644
--- a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
@@ -845,6 +845,11 @@
                       DexVm.Version.V4_4_4,
                       DexVm.Version.V5_1_1,
                       DexVm.Version.V6_0_1)))
+          // Class.forName() that fails due to verification error is removed.
+          .put(
+              "412-new-array",
+              TestCondition.match(
+                  TestCondition.compilers(CompilerUnderTest.R8, CompilerUnderTest.R8_AFTER_D8)))
           // Array index out of bounds exception.
           .put("449-checker-bce", TestCondition.any())
           // Fails: get_vreg_jni.cc:46] Check failed: value == 42u (value=314630384, 42u=42)
@@ -887,6 +892,11 @@
           .put("575-checker-string-init-alias", TestCondition.any())
           // Runtime exception.
           .put("577-profile-foreign-dex", TestCondition.any())
+          // Class.forName() that fails due to linkage error is removed.
+          .put(
+              "587-inline-class-error",
+              TestCondition.match(
+                  TestCondition.compilers(CompilerUnderTest.R8, CompilerUnderTest.R8_AFTER_D8)))
           // Array index out of bounds exception.
           .put("602-deoptimizeable", TestCondition.any())
           // Array index out of bounds exception.