Disable debugger tests on art 12
Bug: 199700280
Change-Id: Ib05372cc5c620f2ca542dd89d85d2a7098fcdefd
diff --git a/src/test/java/com/android/tools/r8/debug/ArrayDimensionGreaterThanSevenTestRunner.java b/src/test/java/com/android/tools/r8/debug/ArrayDimensionGreaterThanSevenTestRunner.java
index b137f64..a63c85a 100644
--- a/src/test/java/com/android/tools/r8/debug/ArrayDimensionGreaterThanSevenTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debug/ArrayDimensionGreaterThanSevenTestRunner.java
@@ -51,6 +51,11 @@
@Test
// Once R8 does not use expanded frames this can be enabled again.
public void test() throws Exception {
+ // TODO(b/199700280): Reenable on 12.0.0 when we have the libjdwp.so file include and the flags
+ // fixed.
+ Assume.assumeTrue(
+ "Skipping test " + testName.getMethodName() + " because debugging not enabled in 12.0.0",
+ !ToolHelper.getDexVm().isEqualTo(DexVm.ART_12_0_0_HOST));
Assume.assumeTrue(ToolHelper.getDexVm().isNewerThan(DexVm.ART_5_1_1_HOST)
&& !ToolHelper.isWindows());
DebugTestConfig cfConfig = new CfDebugTestConfig().addPaths(ToolHelper.getClassPathForTests());
diff --git a/src/test/java/com/android/tools/r8/debug/ArraySimplificationLineNumberTestRunner.java b/src/test/java/com/android/tools/r8/debug/ArraySimplificationLineNumberTestRunner.java
index 22bca9f..4f72a65 100644
--- a/src/test/java/com/android/tools/r8/debug/ArraySimplificationLineNumberTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debug/ArraySimplificationLineNumberTestRunner.java
@@ -4,10 +4,12 @@
package com.android.tools.r8.debug;
import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.ToolHelper.DexVm;
import com.android.tools.r8.ToolHelper.DexVm.Version;
import com.android.tools.r8.VmTestRunner;
import com.android.tools.r8.VmTestRunner.IgnoreIfVmOlderThan;
import java.util.Collections;
+import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -21,6 +23,11 @@
@Test
@IgnoreIfVmOlderThan(Version.V6_0_1)
public void testHitOnEntryOnly() throws Throwable {
+ // TODO(b/199700280): Reenable on 12.0.0 when we have the libjdwp.so file include and the flags
+ // fixed.
+ Assume.assumeTrue(
+ "Skipping test " + testName.getMethodName() + " because debugging not enabled in 12.0.0",
+ !ToolHelper.getDexVm().isEqualTo(DexVm.ART_12_0_0_HOST));
DebugTestConfig cf = new CfDebugTestConfig().addPaths(ToolHelper.getClassPathForTests());
DebugTestConfig d8 = new D8DebugTestConfig().compileAndAdd(
temp, Collections.singletonList(ToolHelper.getClassFileForTestClass(CLASS)));
diff --git a/src/test/java/com/android/tools/r8/debug/DebugTestBase.java b/src/test/java/com/android/tools/r8/debug/DebugTestBase.java
index d92d4ec..baa98a2 100644
--- a/src/test/java/com/android/tools/r8/debug/DebugTestBase.java
+++ b/src/test/java/com/android/tools/r8/debug/DebugTestBase.java
@@ -188,6 +188,11 @@
protected DebugTestRunner getDebugTestRunner(
DebugTestConfig config, String debuggeeClass, List<JUnit3Wrapper.Command> commands)
throws Throwable {
+ // TODO(b/199700280): Reenable on 12.0.0 when we have the libjdwp.so file include and the flags
+ // fixed.
+ Assume.assumeTrue(
+ "Skipping test " + testName.getMethodName() + " because debugging not enabled in 12.0.0",
+ !ToolHelper.getDexVm().isEqualTo(DexVm.ART_12_0_0_HOST));
// Skip test due to unsupported runtime.
Assume.assumeTrue("Skipping test " + testName.getMethodName() + " because ART is not supported",
ToolHelper.artSupported());
diff --git a/src/test/java/com/android/tools/r8/debug/ExamplesDebugTest.java b/src/test/java/com/android/tools/r8/debug/ExamplesDebugTest.java
index 12c6bc8..349ac60 100644
--- a/src/test/java/com/android/tools/r8/debug/ExamplesDebugTest.java
+++ b/src/test/java/com/android/tools/r8/debug/ExamplesDebugTest.java
@@ -7,6 +7,7 @@
import com.android.tools.r8.OutputMode;
import com.android.tools.r8.R8Command;
import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.ToolHelper.DexVm;
import com.android.tools.r8.ToolHelper.DexVm.Version;
import com.android.tools.r8.debug.DebugTestBase.JUnit3Wrapper.DebuggeeState;
import com.android.tools.r8.origin.Origin;
@@ -335,6 +336,11 @@
}
private DebugStreamComparator init(String pkg, String clazz) throws Exception {
+ // TODO(b/199700280): Reenable on 12.0.0 when we have the libjdwp.so file include and the flags
+ // fixed.
+ Assume.assumeTrue(
+ "Skipping test " + testName.getMethodName() + " because debugging not enabled in 12.0.0",
+ !ToolHelper.getDexVm().isEqualTo(DexVm.ART_12_0_0_HOST));
// See verifyStateLocation in DebugTestBase.
Assume.assumeTrue(
"Streaming on Dalvik DEX runtimes has some unknown interference issue",
diff --git a/src/test/java/com/android/tools/r8/debug/IincDebugTestRunner.java b/src/test/java/com/android/tools/r8/debug/IincDebugTestRunner.java
index 3e7367e..8a503e9 100644
--- a/src/test/java/com/android/tools/r8/debug/IincDebugTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debug/IincDebugTestRunner.java
@@ -14,6 +14,7 @@
import com.android.tools.r8.R8Command;
import com.android.tools.r8.R8Command.Builder;
import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.ToolHelper.DexVm;
import com.android.tools.r8.ToolHelper.DexVm.Version;
import com.android.tools.r8.ToolHelper.ProcessResult;
import com.android.tools.r8.debug.DebugTestBase.JUnit3Wrapper.DebuggeeState;
@@ -69,6 +70,11 @@
}
private void stepOutput(byte[] clazz) throws Exception {
+ // TODO(b/199700280): Reenable on 12.0.0 when we have the libjdwp.so file include and the flags
+ // fixed.
+ Assume.assumeTrue(
+ "Skipping test " + testName.getMethodName() + " because debugging not enabled in 12.0.0",
+ !ToolHelper.getDexVm().isEqualTo(DexVm.ART_12_0_0_HOST));
// See verifyStateLocation in DebugTestBase.
Assume.assumeTrue(
"Streaming on Dalvik DEX runtimes has some unknown interference issue",
diff --git a/src/test/java/com/android/tools/r8/debug/NonExitingMethodTestRunner.java b/src/test/java/com/android/tools/r8/debug/NonExitingMethodTestRunner.java
index df358b2..6fb4aa7 100644
--- a/src/test/java/com/android/tools/r8/debug/NonExitingMethodTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debug/NonExitingMethodTestRunner.java
@@ -8,6 +8,7 @@
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.R8Command;
import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.ToolHelper.DexVm;
import com.android.tools.r8.ToolHelper.DexVm.Version;
import com.android.tools.r8.VmTestRunner;
import com.android.tools.r8.VmTestRunner.IgnoreIfVmOlderThan;
@@ -56,6 +57,11 @@
@Test
@IgnoreIfVmOlderThan(Version.V6_0_1)
public void test() throws Exception {
+ // TODO(b/199700280): Reenable on 12.0.0 when we have the libjdwp.so file include and the flags
+ // fixed.
+ Assume.assumeTrue(
+ "Skipping test " + testName.getMethodName() + " because debugging not enabled in 12.0.0",
+ !ToolHelper.getDexVm().isEqualTo(DexVm.ART_12_0_0_HOST));
Assume.assumeTrue(
"Skipping test "
+ testName.getMethodName()
diff --git a/src/test/java/com/android/tools/r8/debug/PostIncrementTestRunner.java b/src/test/java/com/android/tools/r8/debug/PostIncrementTestRunner.java
index 6ddc9db..8f967e7 100644
--- a/src/test/java/com/android/tools/r8/debug/PostIncrementTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debug/PostIncrementTestRunner.java
@@ -24,6 +24,11 @@
@Test
@IgnoreIfVmOlderOrEqualThan(Version.V5_1_1)
public void test() throws Exception {
+ // TODO(b/199700280): Reenable on 12.0.0 when we have the libjdwp.so file include and the flags
+ // fixed.
+ Assume.assumeTrue(
+ "Skipping test " + testName.getMethodName() + " because debugging not enabled in 12.0.0",
+ !ToolHelper.getDexVm().isEqualTo(DexVm.ART_12_0_0_HOST));
Assume.assumeTrue("Older runtimes cause some kind of debug streaming issues",
ToolHelper.getDexVm().isNewerThan(DexVm.ART_5_1_1_HOST));
DebugTestConfig cfConfig = new CfDebugTestConfig().addPaths(ToolHelper.getClassPathForTests());
diff --git a/src/test/java/com/android/tools/r8/debug/ThrowNPETestRunner.java b/src/test/java/com/android/tools/r8/debug/ThrowNPETestRunner.java
index 9271847..1f9eca9 100644
--- a/src/test/java/com/android/tools/r8/debug/ThrowNPETestRunner.java
+++ b/src/test/java/com/android/tools/r8/debug/ThrowNPETestRunner.java
@@ -23,6 +23,11 @@
@Test
@IgnoreIfVmOlderOrEqualThan(Version.V5_1_1)
public void test() throws Exception {
+ // TODO(b/199700280): Reenable on 12.0.0 when we have the libjdwp.so file include and the flags
+ // fixed.
+ Assume.assumeTrue(
+ "Skipping test " + testName.getMethodName() + " because debugging not enabled in 12.0.0",
+ !ToolHelper.getDexVm().isEqualTo(DexVm.ART_12_0_0_HOST));
Assume.assumeTrue("Older runtimes cause some kind of debug streaming issues",
ToolHelper.getDexVm().isNewerThan(DexVm.ART_5_1_1_HOST));
DebugTestConfig cfConfig = new CfDebugTestConfig().addPaths(ToolHelper.getClassPathForTests());
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 32cfb18..cbe8874 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(expected = CompilationFailedException.class)
- @IgnoreForRangeOfVmVersions(from = Version.V7_0_0, to = Version.V10_0_0) // No desugaring
+ @IgnoreForRangeOfVmVersions(from = Version.V7_0_0, to = Version.V12_0_0) // No desugaring
public void testInvokeDefault1() throws Exception {
ensureSameOutput(
TestMainDefault1.class.getCanonicalName(),
