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

8208207: Test nsk/stress/jni/gclocker/gcl001 fails after co-location #1023

Closed
wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Apr 8, 2022

I backport this for parity with 11.0.16-oracle.


Progress

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

Issue

  • JDK-8208207: Test nsk/stress/jni/gclocker/gcl001 fails after co-location

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1023

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

Using diff file

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

@GoeLin GoeLin changed the base branch from master to pr/1021 Apr 8, 2022
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 8, 2022

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into pr/1021 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 8208207 Backport 72ae3220224d1c3cd8f031b068bfd8f736937c24 Apr 8, 2022
@openjdk openjdk bot changed the title Backport 72ae3220224d1c3cd8f031b068bfd8f736937c24 8208207: Test nsk/stress/jni/gclocker/gcl001 fails after co-location Apr 8, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Apr 8, 2022

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

@openjdk openjdk bot added backport clean rfr labels Apr 8, 2022
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 8, 2022

Webrevs

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/1021 to master Apr 9, 2022
@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented Apr 9, 2022

The dependent pull request 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 goetz_backport_8242312
git fetch https://git.openjdk.java.net/jdk11u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot removed the clean label Apr 9, 2022
@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Apr 10, 2022

Why isn't this marked clean any more? Maybe you should rebase this PR to current master...

@openjdk openjdk bot added the clean label Apr 11, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Apr 11, 2022

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

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

8208207: Test nsk/stress/jni/gclocker/gcl001 fails after co-location

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:

  • 4741ab5: 8275330: C2: assert(n->is_Root() || n->is_Region() || n->is_Phi() || n->is_MachMerge() || def_block->dominates(block)) failed: uses must be dominated by definitions

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 label Apr 11, 2022
@GoeLin
Copy link
Member Author

@GoeLin GoeLin commented Apr 12, 2022

Pre-submit failure: Agent timeout in langtools tests. Unrelated to this test fix.

@GoeLin
Copy link
Member Author

@GoeLin GoeLin commented Apr 12, 2022

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Apr 12, 2022

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

  • 684fe80: 8220658: Improve the readability of container information in the error log
  • c38229f: 8284507: GHA: Only check test results if testing was not skipped
  • 6f0e5b1: 8284604: [11u] Update Boot JDK used in GHA to 11.0.14.1
  • 869b259: 8284389: Improve stability of GHA Pre-submit testing by caching cygwin installer
  • b930441: 8218136: minor hotspot adjustments for xlclang++ from xlc16 on AIX
  • 9b5d972: 8248876: LoadObject with bad base address created for exec file on linux
  • 4741ab5: 8275330: C2: assert(n->is_Root() || n->is_Region() || n->is_Phi() || n->is_MachMerge() || def_block->dominates(block)) failed: uses must be dominated by definitions

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Apr 12, 2022
@openjdk openjdk bot closed this Apr 12, 2022
@openjdk openjdk bot removed ready rfr labels Apr 12, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Apr 12, 2022

@GoeLin Pushed as commit 3a6dbb4.

💡 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_8208207 branch Jun 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated
2 participants