Merge "Also suppress youtube proguarded, also fails"
diff --git a/src/test/java/com/android/tools/r8/debug/LocalsLiveAtBlockEntryDebugTest.java b/src/test/java/com/android/tools/r8/debug/LocalsLiveAtBlockEntryDebugTest.java
index 09a46e5..85749ab 100644
--- a/src/test/java/com/android/tools/r8/debug/LocalsLiveAtBlockEntryDebugTest.java
+++ b/src/test/java/com/android/tools/r8/debug/LocalsLiveAtBlockEntryDebugTest.java
@@ -6,6 +6,9 @@
import static org.junit.Assert.assertTrue;
import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.ToolHelper.DexVm.Version;
+import com.android.tools.r8.VmTestRunner;
+import com.android.tools.r8.VmTestRunner.IgnoreIfVmOlderThan;
import com.android.tools.r8.jasmin.JasminBuilder;
import com.android.tools.r8.utils.codeinspector.ClassSubject;
import com.android.tools.r8.utils.codeinspector.CodeInspector;
@@ -14,10 +17,10 @@
import java.nio.file.Path;
import java.util.Collections;
import java.util.List;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
/**
* Test to check that locals that are introduced in a block that is not hit, still start in the
@@ -25,6 +28,7 @@
*
* <p>See b/75251251 or b/78617758
*/
+@RunWith(VmTestRunner.class)
public class LocalsLiveAtBlockEntryDebugTest extends DebugTestBase {
final String className = "LocalsLiveAtEntry";
@@ -45,7 +49,7 @@
}
@Test
- @Ignore("b/78617758")
+ @IgnoreIfVmOlderThan(Version.V7_0_0)
public void testD8() throws Throwable {
JasminBuilder builder = getBuilderForTest(className, methodName);
List<Path> outputs = builder.writeClassFiles(temp.newFolder().toPath());
