Ignore tests causing segfaults on ART 6.0.1 during debugging session.
Bug: 73803266
Change-Id: Id999900f5f3a7d5c4b9f75ae5fb12cf3110f9eb1
diff --git a/src/test/java/com/android/tools/r8/debug/BreakAtTryAndCatchTestRunner.java b/src/test/java/com/android/tools/r8/debug/BreakAtTryAndCatchTestRunner.java
index 54c906b..ca2f53f 100644
--- a/src/test/java/com/android/tools/r8/debug/BreakAtTryAndCatchTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debug/BreakAtTryAndCatchTestRunner.java
@@ -4,6 +4,7 @@
package com.android.tools.r8.debug;
import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.ToolHelper.DexVm;
import com.google.common.collect.ImmutableList;
import java.util.Collection;
import java.util.Collections;
@@ -48,6 +49,8 @@
@Test
public void testHitOnEntryOnly() throws Throwable {
Assume.assumeFalse("b/72933440", name.equals("D8/reorder"));
+ Assume.assumeFalse("b/73803266",
+ name.equals("D8") && ToolHelper.getDexVm() == DexVm.ART_6_0_1_HOST);
runDebugTest(
config,
NAME,
diff --git a/src/test/java/com/android/tools/r8/debug/LocalChangeOnSameLineTestRunner.java b/src/test/java/com/android/tools/r8/debug/LocalChangeOnSameLineTestRunner.java
index 002635f..9fe7e23 100644
--- a/src/test/java/com/android/tools/r8/debug/LocalChangeOnSameLineTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debug/LocalChangeOnSameLineTestRunner.java
@@ -4,8 +4,10 @@
package com.android.tools.r8.debug;
import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.ToolHelper.DexVm;
import com.google.common.collect.ImmutableList;
import java.util.Collection;
+import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -17,6 +19,7 @@
private static final String FILE = CLASS.getSimpleName() + ".java";
private static final String NAME = CLASS.getCanonicalName();
+ private final String name;
private final DebugTestConfig config;
@Parameterized.Parameters(name = "{0}")
@@ -29,12 +32,15 @@
}
public LocalChangeOnSameLineTestRunner(String name, DelayedDebugTestConfig config) {
+ this.name = name;
this.config = config.getConfig(temp);
}
/** Test that only hit the break point at line 15 once. */
@Test
public void testHitBreakpointOnce() throws Throwable {
+ Assume.assumeFalse("b/73803266",
+ name.equals("D8") && ToolHelper.getDexVm() == DexVm.ART_6_0_1_HOST);
runDebugTest(
config,
NAME,
