RFR: 8349953: Avoid editing AOTConfiguration file in "make test JTREG=AOT_JDK=true" [v6]

Erik Joelsson erikj at openjdk.org
Wed Feb 19 14:26:56 UTC 2025


On Wed, 19 Feb 2025 00:27:17 GMT, Ioi Lam <iklam at openjdk.org> wrote:

>> When running HotSpot jtreg tests in the "AOT mode", for example:
>> 
>> 
>> make test JTREG=AOT_JDK=true TEST=open/test/hotspot/jtreg/runtime/stringtable
>> 
>> 
>> Before this PR, in the test set up phase, we record several AOT configuration files by running a few separate Java tools (javac, javap, jlink, and jar), and then combine them together with sed, grep, sort and uniq:
>> 
>> https://github.com/openjdk/jdk/blob/adc3f53d2403cd414a91e71c079b4108b2346da0/make/RunTests.gmk#L723-L744
>> 
>> After [JDK-8348426](https://bugs.openjdk.org/browse/JDK-8348426), the AOT configuration file will change to a binary format and can no longer be edited this way. In preparation for [JDK-8348426](https://bugs.openjdk.org/browse/JDK-8348426), we should change the "JTREG_AOT_JDK=true" set up to run a single Java program that accomplishes the same effect as the current implementation.
>> 
>> ** Changes in this PR **
>> 
>> This PR combines the invocation of these Java tools into a single Java program, so we just have a single AOT configuration file. It also uses the `-XX:ExtraSharedClassListFile` option to include the default classlist from the JDK home directory,
>
> Ioi Lam has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Review comments from @erikj79

make/test/BuildTestSetupAOT.gmk line 63:

> 61: IMAGES_TARGETS += $(COPY_SETUP_AOT)
> 62: 
> 63: build: $(TARGETS)

The target `build` is no longer the default target in this makefile, so this line is dead code unless you change the call in Main.gmk by setting `TARGET := build`. You can also just remove this line as the default target `all` gets setup to depend on `$(TARGETS)` anyway in MakeFileEnd.gmk.

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

PR Review Comment: https://git.openjdk.org/jdk/pull/23620#discussion_r1961773716


More information about the build-dev mailing list