Update more Art 16 test expectations
Change-Id: I35672a2dc92dab106c3d84906e2c64b053fd9ed2
diff --git a/src/test/java/com/android/tools/r8/debug/LocalEndTestRunner.java b/src/test/java/com/android/tools/r8/debug/LocalEndTestRunner.java
index e406922..846fd4e 100644
--- a/src/test/java/com/android/tools/r8/debug/LocalEndTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debug/LocalEndTestRunner.java
@@ -6,6 +6,7 @@
import com.android.tools.r8.ByteDataView;
import com.android.tools.r8.ClassFileConsumer;
import com.android.tools.r8.ClassFileConsumer.ArchiveConsumer;
+import com.android.tools.r8.ToolHelper.DexVm.Version;
import com.android.tools.r8.utils.DescriptorUtils;
import com.google.common.collect.ImmutableList;
import java.nio.file.Path;
@@ -56,6 +57,9 @@
Value xInitial = Value.createInt(42);
Value xNormal = Value.createInt(7);
Value xExceptional = xInitial;
+ boolean cfOrArt15OrOlder =
+ config.getRuntime().isCf()
+ || config.getRuntime().asDex().getVersion().isOlderThanOrEqual(Version.V15_0_0);
runDebugTest(
config,
NAME,
@@ -78,9 +82,9 @@
checkLine(FILE, 12),
checkLocal("x", xInitial),
stepOver(),
- checkLine(FILE, 14),
- checkLocal("x", xExceptional),
- stepOver(),
+ applyIf(cfOrArt15OrOlder, () -> checkLine(FILE, 14)),
+ applyIf(cfOrArt15OrOlder, () -> checkLocal("x", xExceptional)),
+ applyIf(cfOrArt15OrOlder, () -> stepOver()),
checkLine(FILE, 16),
checkNoLocal("x"),
run());
diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InterfaceMethodDesugaringTests.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InterfaceMethodDesugaringTests.java
index dd016a2..653c258 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InterfaceMethodDesugaringTests.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InterfaceMethodDesugaringTests.java
@@ -138,7 +138,7 @@
}
@Test
- @IgnoreForRangeOfVmVersions(from = Version.V7_0_0, to = Version.V15_0_0) // No desugaring
+ @IgnoreForRangeOfVmVersions(from = Version.V7_0_0, to = Version.V16_0_0) // No desugaring
public void testInvokeDefault1() throws Exception {
ensureCustomCheck(
(javaResult, d8Result, r8Result, r8ShakenResult) -> {
