RFR: 8352435: Refactor CDS test library for execution and module packaging [v3]

[Calvin Cheung]

On Wed, 26 Mar 2025 19:42:29 GMT, Ioi Lam <iklam at openjdk.org> wrote:

>> In CDS/AOT testing, we have a lot of code that deal with compiling/packaging modules, as well as running various child processes for the training/assembly/production phases.
>> 
>> Currently, these operations are done in many low-level steps, so it's difficult to understand and maintain:
>> 
>> https://github.com/openjdk/jdk/blob/fcc2a24291d499f7149debad1250903ddc369d91/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ExportModule.java
>> 
>> This PR adds a few new classes to simplify the test cases:
>> 
>> Example: build two modular JAR files into `modulePath`
>> 
>> 
>> CDSModulePackager modulePackager = new CDSModulePackager(SRC);
>> modulePath = modulePackager.getOutputDir().toString();
>> 
>> modulePackager.createModularJar("com.foos");
>> modulePackager.createModularJar("com.needsfoosaddexport",
>>                                 "--add-exports",
>>                                 "com.foos/com.foos.internal=com.needsfoosaddexport");
>> 
>> 
>> Example: use modules in training/assembly/production phases
>> 
>> 
>> SimpleCDSAppTester.of("moduleNeedsJdkAddExport")
>>    .classpath(dummyJar)
>>    .modulepath(modulePath)
>>    .addVmArgs("--add-modules", "com.needsjdkaddexport",
>>               "--add-exports", "java.base/jdk.internal.misc=com.needsjdkaddexport", "-Xlog:cds")
>>    .appCommandLine("-m", "com.needsjdkaddexport/com.needsjdkaddexport.Main")
>>    .setAssemblyChecker((OutputAnalyzer out) -> {
>>            out.shouldContain("Full module graph = enabled");
>>         })
>>     .setProductionChecker((OutputAnalyzer out) -> {
>>             out.shouldContain("use_full_module_graph = true; java.base");
>>         })
>>     .runStaticWorkflow()
>>     .runAOTWorkflow();
>
> Ioi Lam has updated the pull request incrementally with two additional commits since the last revision:
> 
>  - @calvinccheung comments
>  - @shipilev comments; renamed variables in ExportModule.java for clarity

You may have forgot to remove a few unused import.

test/lib/jdk/test/lib/cds/CDSModulePackager.java line 31:

> 29: import java.nio.file.Paths;
> 30: import jdk.test.lib.StringArrayUtils;
> 31: import jdk.test.lib.compiler.CompilerUtils;

I think CompilerUtils is not used.

test/lib/jdk/test/lib/cds/SimpleCDSAppTester.java line 28:

> 26: import java.io.File;
> 27: import jdk.test.lib.Asserts;
> 28: import jdk.test.lib.cds.CDSTestUtils;

I think the above two imports are not used.

test/lib/jdk/test/lib/cds/SimpleCDSAppTester.java line 31:

> 29: import jdk.test.lib.process.OutputAnalyzer;
> 30: import jdk.test.lib.StringArrayUtils;
> 31: import jdk.test.whitebox.WhiteBox;

I think WhiteBox is not used.

-------------

PR Review: https://git.openjdk.org/jdk/pull/24122#pullrequestreview-2718942522
PR Review Comment: https://git.openjdk.org/jdk/pull/24122#discussion_r2015194104
PR Review Comment: https://git.openjdk.org/jdk/pull/24122#discussion_r2015194703
PR Review Comment: https://git.openjdk.org/jdk/pull/24122#discussion_r2015195310