8347496: Test jdk/jfr/jvm/TestModularImage.java fails after JDK-8347124: No javac

[jerboaa]

Please review this test-only fix. Apparently there are some test configurations out there that run jdk/jfr/jvm/TestModularImage.java with limited modules. Specifically --limit-modules java.base,jdk.jfr. For this particular test that is not sufficient to be able to run the test. TestModularImage.java uses the ToolProvider API to get a hold of javac as well as for jlink without them being present the test should be skipped.

I've done that by adding those two required modules in the @modules tag.

Testing:

• GHA
• jdk/jfr/jvm/TestModularImage.java with test option --limit-modules jdk.jfr,java.base which now skips the test (instead of failing the test). Running TestModularImage.java without the --limit-modules option and it passes.

Thoughts?

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8347496: Test jdk/jfr/jvm/TestModularImage.java fails after JDK-8347124: No javac (Bug - P3)

Reviewers

• Erik Gahlin (@egahlin - Reviewer)
• David Holmes (@dholmes-ora - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/23079/head:pull/23079
$ git checkout pull/23079

Update a local copy of the PR:
$ git checkout pull/23079
$ git pull https://git.openjdk.org/jdk.git pull/23079/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23079

View PR using the GUI difftool:
$ git pr show -t 23079

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/23079.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back sgehwolf! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

@jerboaa This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8347496: Test jdk/jfr/jvm/TestModularImage.java fails after JDK-8347124: No javac

Reviewed-by: egahlin, dholmes

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 15 new commits pushed to the master branch:

• 6eb83ef: 8347500: hsdis cannot be built with Capstone.next
• c1d322f: 8347627: Compiler replay tests are failing after JDK-8346990
• 0ae5c6b: 8342996: Enhance Attach API to support arbitrary length arguments - OSX
• 91b63ca: 8345016: [ASAN] java.c reported ‘%s’ directive argument is null [-Werror=format-truncation=]
• 379d05b: 8346990: Remove INTX_FORMAT and UINTX_FORMAT macros
• d3a7ac2: 8346383: Cannot use DllMain in libdt_socket for static builds
• 13a1775: 8344146: Remove temporary font file tracking code.
• 61dc07c: 8346869: [AIX] Add regression test for handling 4 Byte aligned doubles in structures
• 13e1ea5: 8346038: [REDO] - [C1] LIR Operations with one input should be implemented as LIR_Op1
• 7c883c2: 8347605: Use spec tag to refer to IEEE 754 standard
• ... and 5 more: https://git.openjdk.org/jdk/compare/062f2dcfe5b62cc3dd3c292eeebd7a7ac78f849a...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[openjdk]

@jerboaa The following label will be automatically applied to this pull request:

• hotspot-jfr

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 00: Full (7549d847)

[egahlin]

Thoughts?

Seems reasonable, as long as the created images don't have other modules it should be fine.

[dholmes-ora]

Looks good. Thanks for fixing!

I agree this was likely always a problem but never observed when run in an agentVM.

[jerboaa]

/integrate

Thanks for the reviews!

[openjdk]

Going to push as commit 3967696.
Since your change was applied there have been 15 commits pushed to the master branch:

• 6eb83ef: 8347500: hsdis cannot be built with Capstone.next
• c1d322f: 8347627: Compiler replay tests are failing after JDK-8346990
• 0ae5c6b: 8342996: Enhance Attach API to support arbitrary length arguments - OSX
• 91b63ca: 8345016: [ASAN] java.c reported ‘%s’ directive argument is null [-Werror=format-truncation=]
• 379d05b: 8346990: Remove INTX_FORMAT and UINTX_FORMAT macros
• d3a7ac2: 8346383: Cannot use DllMain in libdt_socket for static builds
• 13a1775: 8344146: Remove temporary font file tracking code.
• 61dc07c: 8346869: [AIX] Add regression test for handling 4 Byte aligned doubles in structures
• 13e1ea5: 8346038: [REDO] - [C1] LIR Operations with one input should be implemented as LIR_Op1
• 7c883c2: 8347605: Use spec tag to refer to IEEE 754 standard
• ... and 5 more: https://git.openjdk.org/jdk/compare/062f2dcfe5b62cc3dd3c292eeebd7a7ac78f849a...master

Your commit was automatically rebased without conflicts.

[openjdk]

@jerboaa Pushed as commit 3967696.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.