Do not run ObjectsRequireNonNullTest on VMs older than api level K.
Those calls will be replaced by getClass() calls.
Test: $ tools/test.py --dex_vm=all *RequireNonNull*
Bug: 124246610
Change-Id: I272aefda9c839137b87b1cfad6aa5c646b688533
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/ObjectsRequireNonNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/ObjectsRequireNonNullTest.java
index 7a2a84e..f8ef59e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/ObjectsRequireNonNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/ObjectsRequireNonNullTest.java
@@ -10,6 +10,9 @@
import com.android.tools.r8.NeverInline;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestRunResult;
+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.graph.DexMethod;
import com.android.tools.r8.utils.StringUtils;
import com.android.tools.r8.utils.codeinspector.ClassSubject;
@@ -18,6 +21,7 @@
import com.google.common.collect.Streams;
import java.util.Objects;
import org.junit.Test;
+import org.junit.runner.RunWith;
class ObjectsRequireNonNullTestMain {
@@ -59,6 +63,7 @@
}
}
+@RunWith(VmTestRunner.class)
public class ObjectsRequireNonNullTest extends TestBase {
private static final String JAVA_OUTPUT = StringUtils.lines(
"Foo::toString",
@@ -102,6 +107,7 @@
}
@Test
+ @IgnoreIfVmOlderThan(Version.V4_4_4)
public void testD8() throws Exception {
TestRunResult result = testForD8()
.debug()
@@ -119,6 +125,7 @@
}
@Test
+ @IgnoreIfVmOlderThan(Version.V4_4_4)
public void testR8() throws Exception {
// CF disables move result optimization.
TestRunResult result = testForR8(Backend.DEX)
