jdk8u-dev
jdk8u-dev copied to clipboard
8309138: Fix container tests for jdks with symlinked conf dir
Hi all This is backport of JDK-8309138, to fix the testcase bug, which if the tested jdk directory is symlinked, symlinks are followed when copying tested jdk. Only change the testcase lib file, the risk is low.
Additional testing:
- [x] jdk/test/jdk/internal/platform/docker
Progress
- [x] Change must not contain extraneous whitespace
- [x] Commit message must refer to an issue
- [ ] JDK-8309138 needs maintainer approval
Issue
- JDK-8309138: Fix container tests for jdks with symlinked conf dir (Bug - P4 - Requested)
Reviewers
- Paul Hohensee (@phohensee - Reviewer)
Reviewing
Using git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev.git pull/538/head:pull/538
$ git checkout pull/538
Update a local copy of the PR:
$ git checkout pull/538
$ git pull https://git.openjdk.org/jdk8u-dev.git pull/538/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 538
View PR using the GUI difftool:
$ git pr show -t 538
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/538.diff
Webrev
:wave: Welcome back syan! 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.
@sendaoYan This change now passes all automated pre-integration checks.
After integration, the commit message for the final commit will be:
8309138: Fix container tests for jdks with symlinked conf dir
Reviewed-by: phh, sgehwolf
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 36 new commits pushed to the master branch:
- 4fe22e82ebd3640c7999e094903874c9ac7f2391: 6544871: java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html fails from jdk b09 on windows.
- 855480b9336976cfdeea6ff5f57a712e4119e61a: 8334905: [8u] The test java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java started to fail after 8159690
- 4c9c5a4275550fee0dbf46697255c147a8dc98b6: 8327007: javax/swing/JSpinner/8008657/bug8008657.java fails
- 8b28c35f2efe5f4d6bd2f4e36720ca6a529836dd: 8264328: Broken license in javax/swing/JComboBox/8072767/bug8072767.java
- 2afd9188fa17d748dca15bcdc1f39bdb1c6dfca9: 8221903: PIT: javax/swing/RepaintManager/IconifyTest/IconifyTest.java fails on ubuntu18.04
- 439e910420ab9e1ca7c4645bb20634bc7cdbbe57: 8321480: ISO 4217 Amendment 176 Update
- edbdf0538df3fe764ea6a109c3e07cb145dbfe48: 8336928: GHA: Bundle artifacts removal broken
- 1ca84ad59a4db33ab43cebc7d78ee99f87455be1: 8305400: ISO 4217 Amendment 175 Update
- ea76f37ddb113b84f5421d64e687e1b6b7a13ea6: 8338144: [8u] Remove duplicate license files
- fb0a658dd5dc417fa4ce74b17d10c507ed6bc66f: 8335894: [8u] Fix SupplementalJapaneseEraTest.java for jdks with symlinked conf dir
- ... and 26 more: https://git.openjdk.org/jdk8u-dev/compare/c8eb027b59dbb12150a1edd926b14fc2f6753bbd...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 (@phohensee, @jerboaa) 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.
⚠️ @sendaoYan 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.
@sendaoYan Unknown command request - for a list of valid commands use /help.
/approval request Backport of JDK-8309138 to fix the testcase bug, which if the tested jdk directory is symlinked, symlinks are followed when copying tested jdk. Only change the testcase lib file, the risk is low.
@sendaoYan 8309138: The approval request has been created successfully.
The GHA report several failures.
- Some failures are CA issues, which is fixing by PR256. It's unrelated to this PR.
security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#digicerttlseccrootg5
security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#digicerttlsrsarootg5
security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#quovadisrootca1g3
- Linux x86
gc/concurrentMarkSweep/SystemGCOnForegroundCollector.javareport crashCompactibleFreeListSpace::block_size(HeapWord const*), which has been recorded by JDK-8303159, it's unrelated to this PR. - MacOS build fail, the GHA doesn't show any fail logs, maybe it's enviromental issue, or GHA can't pick up MacOS runner.
Thanks for the review.
Please include the same change in the Hotspot copy of
DockerTestUtils.javain this backport.
Thanks for the advice. The Hotspot copy of DockerTestUtils.java has included the same change just now.
/approval request Backport of JDK-8309138 to fix the testcase bug, which if the tested jdk directory is symlinked, symlinks are followed when copying tested jdk. Only change the testcase lib file, the risk is low.
@sendaoYan 8309138: The approval request was already up to date.
Thanks all for the review and approved. /integrate
@sendaoYan Your change (at version a89176e637fd7f0ca365d31afaf0ffd7430ba2f1) is now ready to be sponsored by a Committer.
/sponsor
Going to push as commit 933c78ebd5be5aedc2181b95917933dffe7e279c.
Since your change was applied there have been 36 commits pushed to the master branch:
- 4fe22e82ebd3640c7999e094903874c9ac7f2391: 6544871: java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html fails from jdk b09 on windows.
- 855480b9336976cfdeea6ff5f57a712e4119e61a: 8334905: [8u] The test java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java started to fail after 8159690
- 4c9c5a4275550fee0dbf46697255c147a8dc98b6: 8327007: javax/swing/JSpinner/8008657/bug8008657.java fails
- 8b28c35f2efe5f4d6bd2f4e36720ca6a529836dd: 8264328: Broken license in javax/swing/JComboBox/8072767/bug8072767.java
- 2afd9188fa17d748dca15bcdc1f39bdb1c6dfca9: 8221903: PIT: javax/swing/RepaintManager/IconifyTest/IconifyTest.java fails on ubuntu18.04
- 439e910420ab9e1ca7c4645bb20634bc7cdbbe57: 8321480: ISO 4217 Amendment 176 Update
- edbdf0538df3fe764ea6a109c3e07cb145dbfe48: 8336928: GHA: Bundle artifacts removal broken
- 1ca84ad59a4db33ab43cebc7d78ee99f87455be1: 8305400: ISO 4217 Amendment 175 Update
- ea76f37ddb113b84f5421d64e687e1b6b7a13ea6: 8338144: [8u] Remove duplicate license files
- fb0a658dd5dc417fa4ce74b17d10c507ed6bc66f: 8335894: [8u] Fix SupplementalJapaneseEraTest.java for jdks with symlinked conf dir
- ... and 26 more: https://git.openjdk.org/jdk8u-dev/compare/c8eb027b59dbb12150a1edd926b14fc2f6753bbd...master
Your commit was automatically rebased without conflicts.
@jerboaa @sendaoYan Pushed as commit 933c78ebd5be5aedc2181b95917933dffe7e279c.
:bulb: You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.
Thanks for the sponsor.