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

8335775: Remove extraneous 's' in comment of rawmonitor.cpp test file #826

Closed
wants to merge 1 commit into from

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Jul 5, 2024

A trivial backport to fix a typo (an errant 's') in test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/rawmonitor/rawmonitor.cpp introduced by JDK-8299635. It doesn't apply cleanly as 21u doesn't have JDK-8324681 which bumped the copyright header to 2024 (which probably should have been bumped to 2023 in 8299635!)

This was spotted by George Adams (@gdams) when backporting 8299635 to 17u, where it is now needed to support builds on newer versions of Mac OS. It's a trivial fix it makes sense to clean up everywhere.

This pull request contains a backport of commit ff49f677 from the openjdk/jdk repository.

The commit being backported was authored by Severin Gehwolf on 5 Jul 2024 and was reviewed by George Adams and Thomas Stuefe. Backport to 23 is in progress (openjdk/jdk23u#15)


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8335775 needs maintainer approval

Issue

  • JDK-8335775: Remove extraneous 's' in comment of rawmonitor.cpp test file (Bug - P4 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/826/head:pull/826
$ git checkout pull/826

Update a local copy of the PR:
$ git checkout pull/826
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/826/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 826

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/826.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 5, 2024

👋 Welcome back andrew! 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
Copy link

openjdk bot commented Jul 5, 2024

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

8335775: Remove extraneous 's' in comment of rawmonitor.cpp test file

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

  • 9c9a812: 8211854: [aix] java/net/ServerSocket/AcceptInheritHandle.java fails: read times out
  • 6ff7e2a: 8334297: (so) java/nio/channels/SocketChannel/OpenLeak.java should not depend on SecurityManager
  • 2c2cd9b: 8327401: Some jtreg tests fail on Wayland without any tracking bug

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 changed the title Backport ff49f677ee5017019c90823bc412ceb90068ffbd 8335775: Remove extraneous 's' in comment of rawmonitor.cpp test file Jul 5, 2024
@openjdk
Copy link

openjdk bot commented Jul 5, 2024

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

@openjdk
Copy link

openjdk bot commented Jul 5, 2024

⚠️ @gnu-andrew This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 5, 2024
@mlbridge
Copy link

mlbridge bot commented Jul 5, 2024

Webrevs

@gnu-andrew
Copy link
Member Author

No, bot, this is not a clean backport.

@gnu-andrew
Copy link
Member Author

/approval request Trivial typo fix in a test that was spotted in backporting 8299635 to 17u. Makes sense to fix it everywhere.

@openjdk
Copy link

openjdk bot commented Jul 5, 2024

@gnu-andrew
8335775: The approval request has been created successfully.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Jul 5, 2024
@gnu-andrew
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jul 11, 2024

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

  • cb40bc2: 8315923: pretouch_memory by atomic-add-0 fragments huge pages unexpectedly
  • bbcce3f: 8331518: Tests should not use the "Classpath" exception form of the legal header
  • 5f78ddd: 8328158: Convert java/awt/Choice/NonFocusablePopupMenuTest to automatic main test
  • dc3d552: 8317446: ProblemList gc/arguments/TestNewSizeFlags.java on macosx-aarch64 in Xcomp
  • 8a0dd93: 8335536: Fix assertion failure in IdealGraphPrinter when append is true
  • 9677a85: 8329559: Test javax/swing/JFrame/bug4419914.java failed because The End and Start buttons are not placed correctly and Tab focus does not move as expected
  • 9c9a812: 8211854: [aix] java/net/ServerSocket/AcceptInheritHandle.java fails: read times out
  • 6ff7e2a: 8334297: (so) java/nio/channels/SocketChannel/OpenLeak.java should not depend on SecurityManager
  • 2c2cd9b: 8327401: Some jtreg tests fail on Wayland without any tracking bug

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 11, 2024

@gnu-andrew Pushed as commit c8db6fe.

💡 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 Pull request has been integrated
1 participant