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 #2702

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Jul 11, 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. This is a clean backport from 21u. The original from 24 did not apply cleanly to 21u as it 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.

The original commit being backported was authored by Severin Gehwolf on 5 Jul 2024 and was reviewed by George Adams and Thomas Stuefe. It has been backported to 21u & 23.


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/jdk17u-dev.git pull/2702/head:pull/2702
$ git checkout pull/2702

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2702

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 11, 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 11, 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 32 new commits pushed to the master branch:

  • 97be07a: 8307779: Relax the java.awt.Robot specification
  • 14e3de9: 8319103: Popups that request focus are not shown on Linux with Wayland
  • 385952c: 8328273: sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java failed with java.rmi.server.ExportException: Port already in use
  • 1f0ec1d: 8317316: G1: Make TestG1PercentageOptions use createTestJvm
  • 00b764c: 8299058: AssertionError in sun.net.httpserver.ServerImpl when connection is idle
  • 07be2e5: 8313697: [XWayland][Screencast] consequent getPixelColor calls are slow
  • 2464d8c: 8285497: Add system property for Java SE specification maintenance version
  • 6a31071: Merge
  • 833f65e: 8335963: [17u] Remove designator DEFAULT_PROMOTED_VERSION_PRE=ea for release 17.0.12
  • cac9bbe: 8320548: Improved loop handling
  • ... and 22 more: https://git.openjdk.org/jdk17u-dev/compare/c915eaf47109dae4bce1b72586c4d635acc12b74...master

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 c8db6fe9536148aee152710bad72cd025393e477 8335775: Remove extraneous 's' in comment of rawmonitor.cpp test file Jul 11, 2024
@openjdk
Copy link

openjdk bot commented Jul 11, 2024

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

@openjdk
Copy link

openjdk bot commented Jul 11, 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 11, 2024
@mlbridge
Copy link

mlbridge bot commented Jul 11, 2024

Webrevs

@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. Test failure looks unrelated (timeout)

@openjdk
Copy link

openjdk bot commented Jul 18, 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 18, 2024
@gnu-andrew
Copy link
Member Author

I see jdk17u-fix-yes.
/integrate

@openjdk
Copy link

openjdk bot commented Jul 19, 2024

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

  • ad6b1fa: 8315422: getSoTimeout() would be in try block in SSLSocketImpl
  • 0644986: 8272232: javax/swing/JTable/4275046/bug4275046.java failed with "Expected value in the cell: 'rededited' but found 'redEDITED'."
  • 9e14667: 8332424: Update IANA Language Subtag Registry to Version 2024-05-16
  • 97be07a: 8307779: Relax the java.awt.Robot specification
  • 14e3de9: 8319103: Popups that request focus are not shown on Linux with Wayland
  • 385952c: 8328273: sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java failed with java.rmi.server.ExportException: Port already in use
  • 1f0ec1d: 8317316: G1: Make TestG1PercentageOptions use createTestJvm
  • 00b764c: 8299058: AssertionError in sun.net.httpserver.ServerImpl when connection is idle
  • 07be2e5: 8313697: [XWayland][Screencast] consequent getPixelColor calls are slow
  • 2464d8c: 8285497: Add system property for Java SE specification maintenance version
  • ... and 25 more: https://git.openjdk.org/jdk17u-dev/compare/c915eaf47109dae4bce1b72586c4d635acc12b74...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 19, 2024

@gnu-andrew Pushed as commit 72de151.

💡 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
Development

Successfully merging this pull request may close these issues.

1 participant