commit 39738835085afb72c8ceb85445a37435ef8673fb
author Mathias Rav <mathiasr@google.com> Wed Mar 07 15:57:08 2018 +0100
committer Mathias Rav <mathiasr@google.com> Wed Mar 07 15:57:08 2018 +0100
tree 488473063b7c4b835f2f776b8e1ef5b1b52fa551
parent 90f2056b5423525ec45195205fa95049d219e299

Fix buildbot

Fixes 66f599c1 ("Run CF backend on Art tests", 2018-03-07),
Ib5278913f5f00a6efd26c23f08283e2a61a0e9cf, which was landed before CL 17680
("TypeVerificationHelper: Fix ArrayGet on null receiver") by accident.

Change-Id: Ia7e815d52f07d5797170ed19e16a4f2a26c5f74d

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 813166b..1e2e75b 100644
--- a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
@@ -865,6 +865,10 @@
           // Contains a subset of JUnit which collides with library definitions of JUnit.
           .put("021-string2", TestCondition.match(TestCondition.D8_AFTER_R8CF_COMPILER))
           .put("082-inline-execute", TestCondition.match(TestCondition.D8_AFTER_R8CF_COMPILER))
+          // Bug in TypeVerificationHelper upon ArrayGet on always-NULL array; fixed in CL 17680.
+          .put(
+              "586-checker-null-array-get",
+              TestCondition.match(TestCondition.D8_AFTER_R8CF_COMPILER))
           .build();
 
   // Tests that are invalid dex files and on which R8/D8 fails and that is OK.