jdk17u-dev
jdk17u-dev copied to clipboard
8326591: New test JmodExcludedFiles.java fails on Windows when --with-external-symbols-in-bundles=public is used
Hi all,
This PR contains a backport of 43c6f0b5880899b797fab2f851bd35be1c342439.
Patch is not clean. Test won't build in 17 because it can't find import jdk.internal.util.OperatingSystem.
This class was introduced in 21 as part of JDK-8303485.
I've worked around that by removing the dependency to that utility function and checking the operating system with test/lib/jdk/test/lib/Platform.java.
Testing:
- [x] Modified test case passes
Thanks!
Progress
- [ ] Change must be properly reviewed (1 review required, with at least 1 Reviewer)
- [x] Change must not contain extraneous whitespace
- [x] Commit message must refer to an issue
- [ ] JDK-8326591 needs maintainer approval
Issue
- JDK-8326591: New test JmodExcludedFiles.java fails on Windows when --with-external-symbols-in-bundles=public is used (Bug - P4)
Reviewing
Using git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/2321/head:pull/2321
$ git checkout pull/2321
Update a local copy of the PR:
$ git checkout pull/2321
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/2321/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 2321
View PR using the GUI difftool:
$ git pr show -t 2321
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/2321.diff
Webrev
:wave: Welcome back szaldana! A progress list of the required criteria for merging this PR into pr/2305 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.
@SoniaZaldana 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:
8326591: New test JmodExcludedFiles.java fails on Windows when --with-external-symbols-in-bundles=public is used
Reviewed-by: mdoerr
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 22 new commits pushed to the master branch:
- d2b9c01b37386e62c41e02902a94220246ba7851: 8302907: [PPC64] Use more constexpr in class Register
- e0dba38e6bdcf0f9589d6bf2fa9a8ea0887696c3: 8280835: jdk/javadoc/tool/CheckManPageOptions.java depends on source hierarchy
- 8f0fa10670c1c2e9c41cf6cd62582f1e4cb763e9: 8267796: vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t002/TestDescription.java fails with NoClassDefFoundError
- e2791f3304768729fbc665886f9c406fb3d1bf39: 8286490: JvmtiEventControllerPrivate::set_event_callbacks CLEARING_MASK computation is incorrect
- f789e384e55feaf10a08846e1f667c97367d317b: 8307423: [s390x] Represent Registers as values
- bf4b15ce080bfdf1dd818233cd1ef6ac0519294d: 8321925: sun/security/mscapi/KeytoolChangeAlias.java fails with "Alias <246810> does not exist"
- ce1fb0265b3edf904ea00b190957e8a70371a080: 8311964: Some jtreg tests failing on x86 with error 'unrecognized VM options' (C2 flags)
- 606c542e7f9cb629e030463f07994e665f6212a2: 8326201: [S390] Need to bailout cleanly if creation of stubs fails when code cache is out of space
- 16579f8658b6422131dd3ca35e7276eb6c477c12: 8297445: PPC64: Represent Registers as values
- 20c2511f54bbae0d41f8750f5e02c6b59630d66f: 8309890: TestStringDeduplicationInterned.java waits for the wrong condition
- ... and 12 more: https://git.openjdk.org/jdk17u-dev/compare/51502b9c33d27696bbc3a3f08742d5de6cd7b59e...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.
As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@TheRealMDoerr) but any other Committer may sponsor as well.
➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).
This backport pull request has now been updated with issue from the original commit.
Webrevs
- 03: Full - Incremental (4f9ce06c)
- 02: Full - Incremental (d6349c50)
- 01: Full - Incremental (d207bf79)
- 00: Full (d6ac58ea)
@SoniaZaldana This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!
⚠️ @SoniaZaldana This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).
Hi Sonia, the usual way would be to use test/lib/jdk/test/lib/Platform.java instead of System.getProperty("os.name").
The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:
git checkout my-backport-8326591
git fetch https://git.openjdk.org/jdk17u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push
SAP nightlies passed on 2024-05-01
- Automated jtreg test: jtreg_jdk_tier1
jdk/modules/etc/JmodExcludedFiles.java: SUCCESSFUL GitHub 📊⏲ - [526 msec]
⚠️ @SoniaZaldana This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.
/integrate
@SoniaZaldana Your change (at version 4f9ce06c3bbf8a059dbe9af4c8ce3a12e614f0bf) is now ready to be sponsored by a Committer.
/sponsor
Going to push as commit 68caeca1a5f265ca30a7e6d2a62127d458a3473e.
Since your change was applied there have been 22 commits pushed to the master branch:
- d2b9c01b37386e62c41e02902a94220246ba7851: 8302907: [PPC64] Use more constexpr in class Register
- e0dba38e6bdcf0f9589d6bf2fa9a8ea0887696c3: 8280835: jdk/javadoc/tool/CheckManPageOptions.java depends on source hierarchy
- 8f0fa10670c1c2e9c41cf6cd62582f1e4cb763e9: 8267796: vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t002/TestDescription.java fails with NoClassDefFoundError
- e2791f3304768729fbc665886f9c406fb3d1bf39: 8286490: JvmtiEventControllerPrivate::set_event_callbacks CLEARING_MASK computation is incorrect
- f789e384e55feaf10a08846e1f667c97367d317b: 8307423: [s390x] Represent Registers as values
- bf4b15ce080bfdf1dd818233cd1ef6ac0519294d: 8321925: sun/security/mscapi/KeytoolChangeAlias.java fails with "Alias <246810> does not exist"
- ce1fb0265b3edf904ea00b190957e8a70371a080: 8311964: Some jtreg tests failing on x86 with error 'unrecognized VM options' (C2 flags)
- 606c542e7f9cb629e030463f07994e665f6212a2: 8326201: [S390] Need to bailout cleanly if creation of stubs fails when code cache is out of space
- 16579f8658b6422131dd3ca35e7276eb6c477c12: 8297445: PPC64: Represent Registers as values
- 20c2511f54bbae0d41f8750f5e02c6b59630d66f: 8309890: TestStringDeduplicationInterned.java waits for the wrong condition
- ... and 12 more: https://git.openjdk.org/jdk17u-dev/compare/51502b9c33d27696bbc3a3f08742d5de6cd7b59e...master
Your commit was automatically rebased without conflicts.
@TheRealMDoerr @SoniaZaldana Pushed as commit 68caeca1a5f265ca30a7e6d2a62127d458a3473e.
:bulb: You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.