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

8210198: Clean up JNI_ENV_ARG for vmTestbase/jvmti/Get[A-F] tests #639

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Nov 18, 2021

I backport this for parity with 11.0.14-oracle.


Progress

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

Issue

  • JDK-8210198: Clean up JNI_ENV_ARG for vmTestbase/jvmti/Get[A-F] tests

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 639

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 18, 2021

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into pr/634 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 d256eb923bfdf82ffd2fa13a5cae3ba4893db050 8210198: Clean up JNI_ENV_ARG for vmTestbase/jvmti/Get[A-F] tests Nov 18, 2021
@openjdk
Copy link

openjdk bot commented Nov 18, 2021

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

@openjdk openjdk bot added backport clean rfr Pull request is ready for review labels Nov 18, 2021
@mlbridge
Copy link

mlbridge bot commented Nov 18, 2021

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Nov 19, 2021

Pre-submit build error because I based this on #634, I should have based it on #637 which includes a fix for this.

@GoeLin GoeLin changed the base branch from pr/634 to pr/637 November 19, 2021 14:19
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/637 to master November 20, 2021 20:14
@openjdk-notifier
Copy link

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_8226943
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 Nov 20, 2021
@openjdk
Copy link

openjdk bot commented Nov 22, 2021

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

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

8210198: Clean up JNI_ENV_ARG for vmTestbase/jvmti/Get[A-F] tests

Remove JNI_ENV macros from the Get[A-F] tests

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Nov 22, 2021
@GoeLin
Copy link
Member Author

GoeLin commented Nov 22, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Nov 22, 2021

Going to push as commit e2b7f1e.

@openjdk openjdk bot closed this Nov 22, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 22, 2021
@openjdk
Copy link

openjdk bot commented Nov 22, 2021

@GoeLin Pushed as commit e2b7f1e.

💡 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_8210198 branch November 22, 2021 15:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant