commit 5e944b6277f91f0fe698cdf3fdafa8f64c87b04d
author Morten Krogh-Jespersen <mkroghj@google.com> Sat Oct 09 09:32:55 2021 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Sat Oct 09 09:32:55 2021 +0200
tree 7cac808059283ac8f30c41a70dc54dba37f6a23b
parent 0ed2f0758162edd1e364797701ebc7b02349ddaa

Disable proguard retrace tests on dalvik

Change-Id: I2de1333e270de5f4f954f9ff9b3bc892be1761b6

src/test/java/com/android/tools/r8/naming/retraceproguard/InliningRetraceTest.java

diff --git a/src/test/java/com/android/tools/r8/naming/retraceproguard/InliningRetraceTest.java b/src/test/java/com/android/tools/r8/naming/retraceproguard/InliningRetraceTest.java
index 82e841f..016d4ac 100644
--- a/src/test/java/com/android/tools/r8/naming/retraceproguard/InliningRetraceTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retraceproguard/InliningRetraceTest.java
@@ -12,6 +12,7 @@
 
 import com.android.tools.r8.CompilationMode;
 import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.ToolHelper.DexVm.Version;
 import com.android.tools.r8.utils.BooleanUtils;
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;
@@ -26,7 +27,11 @@
   @Parameters(name = "{0}, mode: {1}, compat: {2}")
   public static Collection<Object[]> data() {
     return buildParameters(
-        getTestParameters().withAllRuntimesAndApiLevels().build(),
+        getTestParameters()
+            .withCfRuntimes()
+            .withDexRuntimesStartingFromIncluding(Version.V5_1_1)
+            .withAllApiLevels()
+            .build(),
         CompilationMode.values(),
         BooleanUtils.values());
   }

src/test/java/com/android/tools/r8/naming/retraceproguard/VerticalClassMergingRetraceTest.java

diff --git a/src/test/java/com/android/tools/r8/naming/retraceproguard/VerticalClassMergingRetraceTest.java b/src/test/java/com/android/tools/r8/naming/retraceproguard/VerticalClassMergingRetraceTest.java
index 130e305..54589a7 100644
--- a/src/test/java/com/android/tools/r8/naming/retraceproguard/VerticalClassMergingRetraceTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retraceproguard/VerticalClassMergingRetraceTest.java
@@ -13,6 +13,7 @@
 import com.android.tools.r8.NeverInline;
 import com.android.tools.r8.R8TestBuilder;
 import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.ToolHelper.DexVm.Version;
 import com.android.tools.r8.naming.retraceproguard.StackTrace.StackTraceLine;
 import com.android.tools.r8.utils.BooleanUtils;
 import com.google.common.collect.ImmutableList;
@@ -31,7 +32,11 @@
   @Parameters(name = "{0}, mode: {1}, compat: {2}")
   public static Collection<Object[]> data() {
     return buildParameters(
-        getTestParameters().withAllRuntimesAndApiLevels().build(),
+        getTestParameters()
+            .withCfRuntimes()
+            .withDexRuntimesStartingFromIncluding(Version.V5_1_1)
+            .withAllApiLevels()
+            .build(),
         CompilationMode.values(),
         BooleanUtils.values());
   }