Skip to content

8211899: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/scenarios/[E-M]#670

Closed
GoeLin wants to merge 1 commit intoopenjdk:masterfrom
openjdk-bots:GoeLin-backport-d63acb55
Closed

8211899: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/scenarios/[E-M]#670
GoeLin wants to merge 1 commit intoopenjdk:masterfrom
openjdk-bots:GoeLin-backport-d63acb55

Conversation

@GoeLin
Copy link
Member

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

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 670

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

Using diff file

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

@bridgekeeper
Copy link

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

openjdk bot commented Nov 25, 2021

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Nov 25, 2021
@openjdk
Copy link

openjdk bot commented Nov 25, 2021

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

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

8211899: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/scenarios/[E-M]

Remove the NSK_CPP_STUB macros from 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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 25, 2021
@mlbridge
Copy link

mlbridge bot commented Nov 25, 2021

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Nov 25, 2021

Pre-submit test failure: gc/cms/TestBubbleUpRef.java timed out.
Unrelated to this change.

@GoeLin
Copy link
Member Author

GoeLin commented Nov 29, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Nov 29, 2021

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

  • ccb0ed3: 8212083: Handle remaining gc/lock native code and fix two strings
  • 9e695bb: 8212082: Remove the NSK_CPP_STUB macros for remaining vmTestbase/jvmti/[sS]*
  • 1e0bb2d: 8211432: [REDO] Handle JNIGlobalRefLocker.cpp
  • 48dbaf1: 8261661: gc/stress/TestReclaimStringsLeaksMemory.java fails because Reserved memory size is too big
  • 242bbef: 8270290: NTLM authentication fails if HEAD request is used
  • c395d4b: 8211782: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/[I-S]*
  • 384750d: 8211036: Remove the NSK_STUB macros from vmTestbase for non jvmti
  • b6a9e7e: 8250521: Configure initial RTO to use minimal retry for loopback connections on Windows
  • 7bdb8ac: 8248238: Implementation: JEP 388: Windows AArch64 Support

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 29, 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 29, 2021
@openjdk
Copy link

openjdk bot commented Nov 29, 2021

@GoeLin Pushed as commit 1aecb28.

💡 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 Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

1 participant