8358685: [TEST] AOTLoggingTag.java failed with missing log message

Reviewed-by: iklam, shade
This commit is contained in:
Hamlin Li 2025-06-06 13:59:17 +00:00
parent b2e7cda6a0
commit 9658cecde3

View File

@ -34,7 +34,6 @@
* @run driver AOTLoggingTag * @run driver AOTLoggingTag
*/ */
import java.io.File;
import jdk.test.lib.cds.CDSTestUtils; import jdk.test.lib.cds.CDSTestUtils;
import jdk.test.lib.helpers.ClassFileInstaller; import jdk.test.lib.helpers.ClassFileInstaller;
import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.process.OutputAnalyzer;
@ -59,7 +58,7 @@ public class AOTLoggingTag {
"-cp", appJar, helloClass); "-cp", appJar, helloClass);
out = CDSTestUtils.executeAndLog(pb, "train"); out = CDSTestUtils.executeAndLog(pb, "train");
out.shouldContain("[info][aot] Writing binary AOTConfiguration file:"); out.shouldContain("[aot] Writing binary AOTConfiguration file:");
out.shouldHaveExitValue(0); out.shouldHaveExitValue(0);
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@ -71,7 +70,7 @@ public class AOTLoggingTag {
"-Xlog:aot", "-Xlog:aot",
"-cp", appJar); "-cp", appJar);
out = CDSTestUtils.executeAndLog(pb, "asm"); out = CDSTestUtils.executeAndLog(pb, "asm");
out.shouldContain("[info][aot] Opened AOT configuration file hello.aotconfig"); out.shouldContain("[aot] Opened AOT configuration file hello.aotconfig");
out.shouldHaveExitValue(0); out.shouldHaveExitValue(0);
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@ -81,7 +80,7 @@ public class AOTLoggingTag {
"-Xlog:aot", "-Xlog:aot",
"-cp", appJar, helloClass); "-cp", appJar, helloClass);
out = CDSTestUtils.executeAndLog(pb, "prod"); out = CDSTestUtils.executeAndLog(pb, "prod");
out.shouldContain("[info][aot] Opened AOT cache hello.aot"); out.shouldContain("[aot] Opened AOT cache hello.aot");
out.shouldHaveExitValue(0); out.shouldHaveExitValue(0);
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@ -92,7 +91,7 @@ public class AOTLoggingTag {
"-cp", appJar, helloClass); "-cp", appJar, helloClass);
out = CDSTestUtils.executeAndLog(pb, "prod"); out = CDSTestUtils.executeAndLog(pb, "prod");
out.shouldNotContain("No tag set matches selection: aot+heap"); out.shouldNotContain("No tag set matches selection: aot+heap");
out.shouldContain("[info][aot,heap] resolve subgraph java.lang.Integer$IntegerCache"); out.shouldContain("[aot,heap] resolve subgraph java.lang.Integer$IntegerCache");
out.shouldHaveExitValue(0); out.shouldHaveExitValue(0);
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@ -102,7 +101,7 @@ public class AOTLoggingTag {
"-XX:AOTMode=on", "-XX:AOTMode=on",
"-cp", appJar, helloClass); "-cp", appJar, helloClass);
out = CDSTestUtils.executeAndLog(pb, "prod"); out = CDSTestUtils.executeAndLog(pb, "prod");
out.shouldContain("[error][aot] An error has occurred while processing the AOT cache. Run with -Xlog:aot for details."); out.shouldContain("[aot] An error has occurred while processing the AOT cache. Run with -Xlog:aot for details.");
out.shouldNotHaveExitValue(0); out.shouldNotHaveExitValue(0);
} }