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

8243565: some gc tests use 'test.java.opts' and not 'test.vm.opts' #1395

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Oct 6, 2022

I backport this for parity with 11.0.17-oracle.
TestUseCompressedOopsErgo.java has two additional test cases I had to resolve.
nvdimm tests are not in 11.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8243565: some gc tests use 'test.java.opts' and not 'test.vm.opts'

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev pull/1395/head:pull/1395
$ git checkout pull/1395

Update a local copy of the PR:
$ git checkout pull/1395
$ git pull https://git.openjdk.org/jdk11u-dev pull/1395/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1395

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/1395.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 6, 2022

👋 Welcome back goetz! 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.

@GoeLin GoeLin changed the title Goetz backport 8243565 Backport d84e4f1fd68badf858dacef62314d1c1cbc2b97a Oct 7, 2022
@openjdk openjdk bot changed the title Backport d84e4f1fd68badf858dacef62314d1c1cbc2b97a 8243565: some gc tests use 'test.java.opts' and not 'test.vm.opts' Oct 7, 2022
@openjdk
Copy link

openjdk bot commented Oct 7, 2022

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Oct 7, 2022
@mlbridge
Copy link

mlbridge bot commented Oct 7, 2022

Webrevs

@openjdk-notifier
Copy link

@GoeLin Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

Copy link
Contributor

@RealCLanger RealCLanger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@openjdk
Copy link

openjdk bot commented Oct 10, 2022

@GoeLin This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8243565: some gc tests use 'test.java.opts' and not 'test.vm.opts'

Reviewed-by: clanger

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 1 new commit pushed to the master branch:

  • 9014a18: 8293998: [PPC64] JfrGetCallTrace: assert(_pc != nullptr) failed: must have PC

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 the ready Pull request is ready to be integrated label Oct 10, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Oct 10, 2022

Thanks for the review!

@GoeLin
Copy link
Member Author

GoeLin commented Oct 10, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Oct 10, 2022

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

  • 9c29d00: 8243568: serviceability/logging/TestLogRotation.java uses 'test.java.opts' and not 'test.vm.opts'
  • 3fbcd78: 8215571: jdb does not include jdk.* in the default class filter
  • 9014a18: 8293998: [PPC64] JfrGetCallTrace: assert(_pc != nullptr) failed: must have PC

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Oct 10, 2022
@openjdk openjdk bot closed this Oct 10, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 10, 2022
@openjdk
Copy link

openjdk bot commented Oct 10, 2022

@GoeLin Pushed as commit 3ce188b.

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

@GoeLin GoeLin deleted the goetz_backport_8243565 branch October 10, 2022 07:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants