Don't run VerticalClassMergingRetraceTest on 5.1.1
Art is flaky in the output and will include lines like:
art W 26009 26009 art/runtime/base/mutex.cc:694] ConditionVariable::~ConditionVariable for Thread resumption condition variable called with 1 waiters.
or similar, and cut out the rest of the stack
Change-Id: Ic6a2518e548a833413fba9d6b6e7550ede186cb3
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 a188b06..a834078 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,7 +10,11 @@
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;
@@ -27,11 +31,14 @@
@Parameters(name = "Backend: {0}, mode: {1}")
public static Collection<Object[]> data() {
- return buildParameters(ToolHelper.getBackends(), CompilationMode.values());
+ return buildParameters(TestParametersBuilder.builder()
+ .withDexRuntimesEndingAtExcluding(Version.V5_1_1)
+ .withDexRuntimesStartingFromExcluding(Version.V5_1_1).build(),
+ CompilationMode.values());
}
- public VerticalClassMergingRetraceTest(Backend backend, CompilationMode mode) {
- super(backend, mode);
+ public VerticalClassMergingRetraceTest(TestParameters parameters, CompilationMode mode) {
+ super(parameters.getBackend(), mode);
}
@Override
