From 17dfd6a5736d8341b669739296750a41fd5a0257 Mon Sep 17 00:00:00 2001 From: iklam Date: Fri, 4 Jul 2025 09:40:07 -0700 Subject: [PATCH] 8361367: AOT ExcludedClasses.java test failed with missing constant pool logs --- .../jtreg/runtime/cds/appcds/aotCache/ExcludedClasses.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/ExcludedClasses.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/ExcludedClasses.java index 7c68e4eb7839e..f50a2d1f90527 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/ExcludedClasses.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/ExcludedClasses.java @@ -96,11 +96,8 @@ public String[] appCommandLine(RunMode runMode) { @Override public void checkExecution(OutputAnalyzer out, RunMode runMode) { - if (runMode == RunMode.TRAINING) { - out.shouldMatch("aot,resolve.*reverted field.*TestApp.Foo => TestApp.Foo.ShouldBeExcluded.f:I"); - } else if (runMode == RunMode.ASSEMBLY) { + if (runMode == RunMode.ASSEMBLY) { out.shouldNotMatch("aot,resolve.*archived field.*TestApp.Foo => TestApp.Foo.ShouldBeExcluded.f:I"); - out.shouldMatch("aot,resolve.*archived method.*TestApp.Foo java/lang/Integer.intValue:[(][)]I => java/lang/Integer"); } else if (runMode == RunMode.PRODUCTION) { out.shouldContain("check_verification_constraint: TestApp$Foo$Taz: TestApp$Foo$ShouldBeExcludedChild must be subclass of TestApp$Foo$ShouldBeExcluded"); out.shouldContain("jdk.jfr.Event source: jrt:/jdk.jfr");