Revert "Don't run VerticalClassMergingRetraceTest on 5.1.1"
This reverts commit 894cf1c373260759cba35de543adc17774ae78ef.
Reason for revert: Should not be flaky after https://r8-review.googlesource.com/c/r8/+/37003.
Change-Id: I2433cdb286781c156bd3f6c29c5385438703cddb
diff --git a/src/test/java/com/android/tools/r8/naming/retrace/VerticalClassMergingRetraceTest.java b/src/test/java/com/android/tools/r8/naming/retrace/VerticalClassMergingRetraceTest.java
index a834078..a188b06 100644
--- a/src/test/java/com/android/tools/r8/naming/retrace/VerticalClassMergingRetraceTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retrace/VerticalClassMergingRetraceTest.java
@@ -10,11 +10,7 @@
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.NeverInline;
-import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestParametersBuilder;
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.naming.retrace.StackTrace.StackTraceLine;
import com.google.common.collect.ImmutableList;
import java.util.Collection;
@@ -31,14 +27,11 @@
@Parameters(name = "Backend: {0}, mode: {1}")
public static Collection<Object[]> data() {
- return buildParameters(TestParametersBuilder.builder()
- .withDexRuntimesEndingAtExcluding(Version.V5_1_1)
- .withDexRuntimesStartingFromExcluding(Version.V5_1_1).build(),
- CompilationMode.values());
+ return buildParameters(ToolHelper.getBackends(), CompilationMode.values());
}
- public VerticalClassMergingRetraceTest(TestParameters parameters, CompilationMode mode) {
- super(parameters.getBackend(), mode);
+ public VerticalClassMergingRetraceTest(Backend backend, CompilationMode mode) {
+ super(backend, mode);
}
@Override
