Update status for DX inputs with backports.
Change-Id: I7f39e8808b2641dbc7cf9ed825973e07e368dba0
diff --git a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
index d14254e..4dc03b1 100644
--- a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
@@ -1024,6 +1024,8 @@
.put("506-verify-aput", TestCondition.match(TestCondition.R8DEX_COMPILER))
// Test with invalid register usage: returns a register of either long or double.
.put("510-checker-try-catch", TestCondition.match(TestCondition.R8DEX_COMPILER))
+ // Test with backport method which is still present in DX input.
+ .put("530-checker-lse2", TestCondition.match(TestCondition.tools(DexTool.DX)))
// Test with invalid register usage: contains an int-to-byte on the result of aget-object.
.put("518-null-array-get", TestCondition.match(TestCondition.R8DEX_COMPILER))
// Test with invalid register usage: phi of int and float.
@@ -1037,12 +1039,16 @@
// when running the "default" runtime.
.put(
"567-checker-compare",
- TestCondition.match(TestCondition.runtimes(Runtime.ART_DEFAULT)))
+ TestCondition.or(
+ TestCondition.match(TestCondition.runtimes(Runtime.ART_DEFAULT)),
+ TestCondition.match(TestCondition.tools(DexTool.DX))))
// This test is starting from invalid dex code. It splits up a double value and uses
// the first register of a double with the second register of another double.
.put("800-smali", TestCondition.match(TestCondition.R8DEX_COMPILER))
// Contains a loop in the class hierarchy.
.put("804-class-extends-itself", TestCondition.any())
+ // Test with backport method which is still present in DX input.
+ .put("912-classes", TestCondition.match(TestCondition.tools(DexTool.DX)))
// These tests have illegal class flag combinations, so we reject them.
.put("161-final-abstract-class", TestCondition.any())
.build();
