Update PermittedSubclasses test (again)
Bug: b/434135087
Change-Id: Ic13af4aa49f2894fee1ebc0b5981fa6575fedec0
diff --git a/src/test/java17/com/android/tools/r8/jdk17/sealed/SealedClassesJdk17CompiledTest.java b/src/test/java17/com/android/tools/r8/jdk17/sealed/SealedClassesJdk17CompiledTest.java
index e541dc4..7ee6326 100644
--- a/src/test/java17/com/android/tools/r8/jdk17/sealed/SealedClassesJdk17CompiledTest.java
+++ b/src/test/java17/com/android/tools/r8/jdk17/sealed/SealedClassesJdk17CompiledTest.java
@@ -81,7 +81,7 @@
assertThat(sub1, isPresentAndRenamed());
assertThat(sub2, isPresentAndRenamed());
assertEquals(
- parameters.isCfRuntime() && keepPermittedSubclassesAttribute
+ hasSealedClassesSupport(parameters) && keepPermittedSubclassesAttribute
? ImmutableList.of(sub1.asTypeSubject(), sub2.asTypeSubject())
: ImmutableList.of(),
clazz.getFinalPermittedSubclassAttributes());
@@ -90,6 +90,8 @@
@Test
public void testR8() throws Exception {
parameters.assumeR8TestParameters();
+ assumeTrue(
+ parameters.isDexRuntime() || parameters.asCfRuntime().isNewerThanOrEqual(CfVm.JDK17));
parameters.assumeNoPartialCompilation("TODO");
testForR8(parameters.getBackend())
.addProgramClassesAndInnerClasses(Helper.getSealedClasses())
