8349648: Test tools/jpackage/share/JLinkOptionsTest.java fails with --enable-linkable-runtime set after JDK-8346434#23514
8349648: Test tools/jpackage/share/JLinkOptionsTest.java fails with --enable-linkable-runtime set after JDK-8346434#23514RealCLanger wants to merge 2 commits intoopenjdk:masterfrom
Conversation
|
👋 Welcome back clanger! A progress list of the required criteria for merging this PR into |
|
@RealCLanger 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: 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 52 new commits pushed to the
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 |
|
@RealCLanger The following label will be automatically applied to this pull request:
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. |
Webrevs
|
| final var defaultModules = getModulesInRuntime("--limit-modules java.smartcardio,jdk.crypto.cryptoki,java.desktop"); | ||
| final var modulesWithBindServices = getModulesInRuntime("--bind-services --limit-modules java.smartcardio,jdk.crypto.cryptoki,java.desktop"); |
There was a problem hiding this comment.
Pre-existing: It would be good to document which additional modules in the set get dragged in by --bind-services. That would allow future readers of that test to figure out why a test starts to fail (e.g. by a future change removing a provided service in a module).
There was a problem hiding this comment.
As far as my testing is concerned it's only jdk.crypto.cryptoki which is different with --bind-services (as it provides a security provider as a service and doesn't export API).
There was a problem hiding this comment.
This is the diff of modules between "jpackage without --bind-services" and "jpackage with --bind-services" before this PR:
[20:27:10.849] TRACE: assertNotEquals(, jdk.charsets,jdk.crypto.cryptoki,jdk.crypto.mscapi,jdk.editpad,jdk.jdeps,jdk.jlink,jdk.jpackage,jdk.jstatd,jdk.localedata,jdk.naming.dns,jdk.naming.rmi): Check '--bind-services' option adds modules
There was a problem hiding this comment.
I added a comment about what is expected.
|
Thanks for the reviews. /integrate |
|
Going to push as commit 29202d1.
Your commit was automatically rebased without conflicts. |
|
@RealCLanger Pushed as commit 29202d1. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
The change for JDK-8346434 added a new test case to tools/jpackage/share/JLinkOptionsTest.java which does not respect the constraint of the linkable runtime (JEP 493) that no jdk.jlink module can be part of the target image.
This can be circumvented by limiting the modules.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/23514/head:pull/23514$ git checkout pull/23514Update a local copy of the PR:
$ git checkout pull/23514$ git pull https://git.openjdk.org/jdk.git pull/23514/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 23514View PR using the GUI difftool:
$ git pr show -t 23514Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/23514.diff
Using Webrev
Link to Webrev Comment