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

8210481: Remove #ifdef cplusplus from vmTestbase #647

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Nov 22, 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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 647

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 22, 2021

👋 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.

@openjdk openjdk bot changed the title Backport 510336c21088fa08d09fab5fe8aac4ed4f7b62c6 8210481: Remove #ifdef cplusplus from vmTestbase Nov 22, 2021
@openjdk
Copy link

openjdk bot commented Nov 22, 2021

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

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

8210481: Remove #ifdef cplusplus from vmTestbase

Remove all cplusplus ifdefs from vmTestbase

Reviewed-by: stuefe

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:

  • 2fb8ca2: 8273026: Slow LoginContext.login() on multi threading application
  • e2b7f1e: 8210198: Clean up JNI_ENV_ARG for vmTestbase/jvmti/Get[A-F] tests

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 Nov 22, 2021
@mlbridge
Copy link

mlbridge bot commented Nov 22, 2021

Webrevs

Copy link
Member

@tstuefe tstuefe left a comment

Seems straightforward.

@GoeLin
Copy link
Member Author

GoeLin commented Nov 24, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Nov 24, 2021

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

  • 4b5075e: 8210665: Clean up JNI_ENV_ARG and factorize the macros for vmTestbase/jvmti[R-U] tests
  • 8fcfaef: 8210593: Clean up JNI_ENV_ARG and factorize the macros for vmTestbase/jvmti[N-R] tests
  • 46c41b6: 8210429: Clean up JNI_ENV_ARG for vmTestbase/jvmti/Get[G-Z] tests
  • 06e9f96: 8210242: [TESTBUG] vmTestbase/nsk/stress/jni/jnistress001.java crashes with EXCEPTION_ACCESS_VIOLATION on windows-x86
  • dcc010d: 8273235: tools/launcher/HelpFlagsTest.java Fails on Windows 32bit
  • 2fb8ca2: 8273026: Slow LoginContext.login() on multi threading application
  • e2b7f1e: 8210198: Clean up JNI_ENV_ARG for vmTestbase/jvmti/Get[A-F] tests

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 24, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Nov 24, 2021
@openjdk
Copy link

openjdk bot commented Nov 24, 2021

@GoeLin Pushed as commit 2e16341.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated
2 participants