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

8293771: runtime/handshake/SystemMembarHandshakeTransitionTest.java fails if MEMBARRIER_CMD_QUERY is unsupported #10259

Closed
wants to merge 1 commit into from

Conversation

DamonFool
Copy link
Member

@DamonFool DamonFool commented Sep 14, 2022

Hi all,

Please review this trivial fix.
It fails due to the failing msg is incorrect in the test.

Thanks.
Best regards,
Jie


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8293771: runtime/handshake/SystemMembarHandshakeTransitionTest.java fails if MEMBARRIER_CMD_QUERY is unsupported

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/10259/head:pull/10259
$ git checkout pull/10259

Update a local copy of the PR:
$ git checkout pull/10259
$ git pull https://git.openjdk.org/jdk pull/10259/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10259

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/10259.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 14, 2022

👋 Welcome back jiefu! 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 added the rfr Pull request is ready for review label Sep 14, 2022
@openjdk
Copy link

openjdk bot commented Sep 14, 2022

@DamonFool The following label will be automatically applied to this pull request:

  • hotspot-runtime

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Sep 14, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 14, 2022

Webrevs

Copy link
Contributor

@robehn robehn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry my fault! Thanks a lot!

Looks good!

@openjdk
Copy link

openjdk bot commented Sep 14, 2022

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8293771: runtime/handshake/SystemMembarHandshakeTransitionTest.java fails if MEMBARRIER_CMD_QUERY is unsupported

Reviewed-by: rehn

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 5 new commits pushed to the master branch:

  • 91f9c0d: 8293774: Improve TraceOptoParse to dump the bytecode name
  • 1169a15: 8291657: Javac assertion when compiling a method call with switch expression as argument
  • 2baf251: 8293654: Improve SharedRuntime handling of continuation helper out-arguments
  • 60f59a4: 8293660: Fix frame::sender_for_compiled_frame frame size assert
  • b3461c1: 8293680: PPC64BE build failure after JDK-8293344

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 Pull request is ready to be integrated label Sep 14, 2022
@DamonFool
Copy link
Member Author

Thanks @robehn .
/integrate

@openjdk
Copy link

openjdk bot commented Sep 14, 2022

Going to push as commit 8351b30.
Since your change was applied there have been 5 commits pushed to the master branch:

  • 91f9c0d: 8293774: Improve TraceOptoParse to dump the bytecode name
  • 1169a15: 8291657: Javac assertion when compiling a method call with switch expression as argument
  • 2baf251: 8293654: Improve SharedRuntime handling of continuation helper out-arguments
  • 60f59a4: 8293660: Fix frame::sender_for_compiled_frame frame size assert
  • b3461c1: 8293680: PPC64BE build failure after JDK-8293344

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 14, 2022
@openjdk openjdk bot closed this Sep 14, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 14, 2022
@openjdk
Copy link

openjdk bot commented Sep 14, 2022

@DamonFool Pushed as commit 8351b30.

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

@DamonFool DamonFool deleted the JDK-8293771 branch September 14, 2022 07:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
2 participants