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

8211801: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/scenarios/[A-E] #660

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Nov 24, 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-8211801: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/scenarios/[A-E]

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 660

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 24, 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 efa175f20e11a722f8f8a3f62ef395c863da44ac 8211801: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/scenarios/[A-E] Nov 24, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 24, 2021

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

@openjdk
Copy link

@openjdk openjdk bot commented Nov 24, 2021

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

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

8211801: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/scenarios/[A-E]

Remove the NSK_CPP_STUB macros

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 ready rfr labels Nov 24, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 24, 2021

Webrevs

@GoeLin
Copy link
Member Author

@GoeLin GoeLin commented Nov 25, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 25, 2021

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

  • 84a3397: 8211905: Remove multiple casts for EM06 file
  • 91c6420: 8211131: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/[G-I]*
  • 0b8e1b1: 8211261: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/[A-G]*
  • a7f1b72: 8210984: [TESTBUG] hs203t003 fails with "# ERROR: hs203t003.cpp, 218: NSK_CPP_STUB2 ( ResumeThread, jvmti, thread)"
  • 6d1c3c6: 8210689: Remove the multi-line old C style for string literals
  • 9a1fce0: 8210726: Fix up a few minor nits forgotten by JDK-8210665
  • 6c6f9ef: 8210385: Clean up JNI_ENV_ARG and factorize the macros for vmTestbase/jvmti[A-N] tests
  • b3ef0ea: 8271567: AArch64: AES Galois CounterMode (GCM) interleaved implementation using vector instructions

Your commit was automatically rebased without conflicts.

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

@openjdk openjdk bot commented Nov 25, 2021

@GoeLin Pushed as commit 87c04f2.

💡 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
1 participant