jdk17u-dev
jdk17u-dev copied to clipboard
openjdk
8309890: TestStringDeduplicationInterned.java waits for the wrong condition
Clean backport to pass the correct string so that waitForDeduplication does not always wait for 10 seconds before proceeding.
Progress
- [x] Change must not contain extraneous whitespace
- [x] Commit message must refer to an issue
- [ ] JDK-8309890 needs maintainer approval
Issue
- JDK-8309890: TestStringDeduplicationInterned.java waits for the wrong condition (Bug - P4 - Requested)
Reviewing
Using git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/2432/head:pull/2432
$ git checkout pull/2432
Update a local copy of the PR:
$ git checkout pull/2432
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/2432/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 2432
View PR using the GUI difftool:
$ git pr show -t 2432
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/2432.diff
Webrev
:wave: Welcome back acmoraru! 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.
![bridgekeeper[bot] avatar](https://avatars.githubusercontent.com/u/41768318?v=4 "Published by a pub.dev verified publisher"){kind=small}
@acmoraru 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:
8309890: TestStringDeduplicationInterned.java waits for the wrong condition
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 19 new commits pushed to the master branch:
- e97489774f0b893ed173be05e5d848ee2af76775: 8298413: [s390] CPUInfoTest fails due to uppercase feature string
- d2982c673053bdea8bc122230a4d57eda76832ef: 8331641: [17u]: Bump GHA bootstrap JDK to 17.0.11
- 68a2d93588b1b3cdf1a8c8eb135581ede97c8ac3: 8330094: RISC-V: Save and restore FRM in the call stub
- 32bf1f4169fd07291d608323c143832ad48e531e: 8325579: Inconsistent behavior in com.sun.jndi.ldap.Connection::createSocket
- 025969c97e8b6dc600d2935c4225d04dae6e23bf: 8326521: JFR: CompilerPhase event test fails on windows 32 bit
- c3ed2649fdbb087687980a09f855a20995adbdac: 8272916: Copyright year was modified unintentionally in jlink.properties and ImagePluginStack.java
- 47ad3b46ce30c0c891994e48420861bf44a14f47: 8273774: CDSPluginTest should only expect classes_nocoops.jsa exists on supported 64-bit platforms
- 51502b9c33d27696bbc3a3f08742d5de6cd7b59e: 8328168: Epsilon: Premature OOM when allocating object larger than uncommitted heap size
- cb15a1571a33af4626cab9aef11b382120bc6816: 8330156: RISC-V: Range check auipc + signed 12 imm instruction
- e9a088d1a1b564020579fec890b51b6c05b4f34e: 8331113: createJMHBundle.sh support configurable maven repo mirror
- ... and 9 more: https://git.openjdk.org/jdk17u-dev/compare/54e012001e593596c12b117af766e1adb0c03fef...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.
➡️ 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).
⚠️ @acmoraru 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.
/approval request Improves InternedTest in TestStringDeduplicationTools.java so that there is not always up-to a 10 second wait for deduplication (since the incorrect comparison string was being passed). Backport applies cleanly. Affected test passes. Risk is low: change is test code only.
@acmoraru Your change (at version 7bd642f6c3c00e9bcda9ed5a1f8b732fef4ce766) is now ready to be sponsored by a Committer.
Going to push as commit 20c2511f54bbae0d41f8750f5e02c6b59630d66f.
Since your change was applied there have been 24 commits pushed to the master branch:
- 8f68f8f019bca842b4bdf366f3c364b25983fd9e: 8316142: Enable parallelism in vmTestbase/nsk/monitoring/stress/lowmem tests
- 4504b16390fc8c00542fdc43625e0e03a8cbc7c7: 8280113: (dc) DatagramSocket.receive does not always throw when the channel is closed
- 97cc17719d01122399d1d5ea9bed02af321b27e6: 8042380: Test javax/swing/JFileChooser/4524490/bug4524490.java fails with InvocationTargetException
- e552509bcbbba5562219355841cf3dedd7daaeb8: 8297082: Remove sun/tools/jhsdb/BasicLauncherTest.java from problem list
- 5a3c668646c363f2a2028e4aede63eef524ad5fd: 8272315: Improve assert_different_registers
- e97489774f0b893ed173be05e5d848ee2af76775: 8298413: [s390] CPUInfoTest fails due to uppercase feature string
- d2982c673053bdea8bc122230a4d57eda76832ef: 8331641: [17u]: Bump GHA bootstrap JDK to 17.0.11
- 68a2d93588b1b3cdf1a8c8eb135581ede97c8ac3: 8330094: RISC-V: Save and restore FRM in the call stub
- 32bf1f4169fd07291d608323c143832ad48e531e: 8325579: Inconsistent behavior in com.sun.jndi.ldap.Connection::createSocket
- 025969c97e8b6dc600d2935c4225d04dae6e23bf: 8326521: JFR: CompilerPhase event test fails on windows 32 bit
- ... and 14 more: https://git.openjdk.org/jdk17u-dev/compare/54e012001e593596c12b117af766e1adb0c03fef...master
Your commit was automatically rebased without conflicts.
@shipilev @acmoraru Pushed as commit 20c2511f54bbae0d41f8750f5e02c6b59630d66f.
:bulb: You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.