Disabled tests for Windows and old Android versions. Test is independent from Android versions/OS anyway, it fails in such configurations due to the test infrastructure and not for relevant reasons
Change-Id: Iea6a54033964e4bc1c94f71c690956da42c0a45e
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 393fe21..ebacaea 100644
--- a/src/test/java/com/android/tools/r8/debug/ArrayDimensionGreaterThanSevenTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debug/ArrayDimensionGreaterThanSevenTestRunner.java
@@ -13,6 +13,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.ProcessResult;
import com.android.tools.r8.debug.DebugTestBase.JUnit3Wrapper.DebuggeeState;
import com.android.tools.r8.origin.Origin;
@@ -23,6 +24,7 @@
import java.nio.file.Path;
import java.util.function.Consumer;
import java.util.stream.Stream;
+import org.junit.Assume;
import org.junit.Ignore;
import org.junit.Test;
@@ -55,6 +57,8 @@
@Test
// Once R8 does not use expanded frames this can be enabled again.
public void test() throws Exception {
+ Assume.assumeTrue(ToolHelper.getDexVm().isNewerThan(DexVm.ART_5_1_1_HOST)
+ && !ToolHelper.isWindows());
DebugTestConfig cfConfig = new CfDebugTestConfig().addPaths(ToolHelper.getClassPathForTests());
DebugTestConfig d8Config = new D8DebugTestConfig().compileAndAddClasses(temp, CLASS);
DebugTestConfig r8JarConfig =
@@ -83,6 +87,6 @@
null);
consumer.finished(null);
ProcessResult result = ToolHelper.runJava(out, NAME);
- assertEquals("Assumes ASM can go at least up to 7 dimensions", 0, result.exitCode);
+ assertEquals("Assumes ASM can go up to 7 dimensions", 0, result.exitCode);
}
}
