Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8278115: gc/stress/gclocker/TestGCLockerWithSerial.java has duplicate -Xmx #20

Closed

Conversation

shipilev
Copy link
Contributor

@shipilev shipilev commented Dec 21, 2021

Clean backport to improve testing.

Additional testing:

  • Linux x86_64 fastdebug, affected test still passes

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8278115: gc/stress/gclocker/TestGCLockerWithSerial.java has duplicate -Xmx

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17u-dev pull/20/head:pull/20
$ git checkout pull/20

Update a local copy of the PR:
$ git checkout pull/20
$ git pull https://git.openjdk.java.net/jdk17u-dev pull/20/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 20

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17u-dev/pull/20.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 21, 2021

👋 Welcome back shade! 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 openjdk bot changed the title Backport 0fbd2713f1b47c343172fa34be021706c957520e 8278115: gc/stress/gclocker/TestGCLockerWithSerial.java has duplicate -Xmx Dec 21, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 21, 2021

This backport pull request has now been updated with issue from the original commit.

@openjdk
Copy link

@openjdk openjdk bot commented Dec 21, 2021

@shipilev 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:

8278115: gc/stress/gclocker/TestGCLockerWithSerial.java has duplicate -Xmx

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 2 new commits pushed to the master branch:

  • 5ea8f48: 8277385: Zero: Enable CompactStrings support
  • cb06a20: 8275586: Zero: Simplify interpreter initialization

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 openjdk bot added ready rfr labels Dec 21, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 21, 2021

Webrevs

@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Dec 22, 2021

Got the push approval.

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Dec 22, 2021

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

  • 6634879: 8278116: runtime/modules/LoadUnloadModuleStress.java has duplicate -Xmx
  • 4b3a9e3: 8277992: Add fast jdk_svc subtests to jdk:tier3
  • cc4a0b1: 8278016: Add compiler tests to tier{2,3}
  • 5ea8f48: 8277385: Zero: Enable CompactStrings support
  • cb06a20: 8275586: Zero: Simplify interpreter initialization

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Dec 22, 2021
@openjdk openjdk bot closed this Dec 22, 2021
@openjdk openjdk bot removed ready rfr labels Dec 22, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 22, 2021

@shipilev Pushed as commit 13d3046.

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

@shipilev shipilev deleted the JDK-8278115-gclocker-duplicate-xmx branch Jan 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated
1 participant