RFR: 8356974: tools/launcher/ToolsOpts.java fails if the build id contains "-J" [v2]
Manuel Hässig
mhaessig at openjdk.org
Mon May 19 09:32:53 UTC 2025
On Mon, 19 May 2025 09:13:14 GMT, Manuel Hässig <mhaessig at openjdk.org> wrote:
>> When passing `-J-version` to the patched javac, `tools/launcher/ToolsOpts.java` wants to verify that the output corresponds to the expected version output. However, if the build id of the JDK running this test contains the substring "-J", then the test fails incorrectly at:
>>
>> https://github.com/openjdk/jdk/blob/97b0dd2167530b3d237e748cd5da0130e38e8af2/test/jdk/tools/launcher/ToolsOpts.java#L131-L134
>>
>> This PR addresses this false positive by looking for the substring `" -J-"` instead. The preceding space to ensure that `-J` occurs at the beginning of a word as an argument would and a `-` suffix since `-J` options are always followed by a dash. Further, this PR adds a print of the output of the test result in case this condition fails, to be able to inspect what triggered the failure.
>>
>> Testing:
>> - [x] [Github Actions](https://github.com/mhaessig/jdk/actions/runs/15023438332)
>> - [x] tier1 and tier2 for Oracle supported platforms and OSs plus Oracle internal testing
>
> Manuel Hässig has updated the pull request incrementally with one additional commit since the last revision:
>
> Update copyright
Thank you for the reviews!
-------------
PR Comment: https://git.openjdk.org/jdk/pull/25230#issuecomment-2890310647
More information about the core-libs-dev
mailing list