Skip to content

8314828: Mark 3 jcmd command-line options test as vm.flagless#322

Closed
GoeLin wants to merge 2 commits intoopenjdk:masterfrom
GoeLin:goetz_backport_8314828
Closed

8314828: Mark 3 jcmd command-line options test as vm.flagless#322
GoeLin wants to merge 2 commits intoopenjdk:masterfrom
GoeLin:goetz_backport_8314828

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 4, 2024

I backport this for parity with 21.0.4-oracle.

As 8312828 breaks the tests, I include follow-up 8316228.
Both are clean backports. Will mark as clean.


Progress

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

Issues

  • JDK-8314828: Mark 3 jcmd command-line options test as vm.flagless (Sub-task - P4 - Approved)
  • JDK-8316228: jcmd tests are broken by 8314828 (Bug - P1 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 322

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 4, 2024

👋 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.

@GoeLin GoeLin changed the title Goetz backport 8314828 backport 7583419d88d7a61007951d5abdff4ac8e620c7d8 Mar 4, 2024
@GoeLin GoeLin changed the title backport 7583419d88d7a61007951d5abdff4ac8e620c7d8 Backport 23fab1181b6a053efc4661d5a10caa90b109aa06 Mar 4, 2024
@openjdk openjdk bot changed the title Backport 23fab1181b6a053efc4661d5a10caa90b109aa06 8314828: Mark 3 jcmd command-line options test as vm.flagless Mar 4, 2024
@openjdk
Copy link

openjdk bot commented Mar 4, 2024

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Mar 4, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Mar 4, 2024

/clean

@openjdk openjdk bot added the clean Identical backport; no merge resolution required label Mar 4, 2024
@openjdk
Copy link

openjdk bot commented Mar 4, 2024

@GoeLin This backport pull request is now marked as clean

@openjdk
Copy link

openjdk bot commented Mar 4, 2024

⚠️ @GoeLin 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.

@mlbridge
Copy link

mlbridge bot commented Mar 4, 2024

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Mar 5, 2024

GHA failure: Risc-V compile issue, unrelated.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Mar 6, 2024
@RealCLanger
Copy link
Contributor

You should add https://bugs.openjdk.org/browse/JDK-8316228 to this PR then, no?

@GoeLin
Copy link
Member Author

GoeLin commented Mar 7, 2024

/issue 8316228

@GoeLin
Copy link
Member Author

GoeLin commented Mar 7, 2024

Yes, you are right, thanks for catching this!

@openjdk
Copy link

openjdk bot commented Mar 7, 2024

@GoeLin
Adding additional issue to issue list: 8316228: jcmd tests are broken by 8314828.

@openjdk
Copy link

openjdk bot commented Mar 7, 2024

@GoeLin 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:

8314828: Mark 3 jcmd command-line options test as vm.flagless
8316228: jcmd tests are broken by 8314828

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

  • ab6e027: 8320712: Rewrite BadFactoryTest in pure Java
  • 40f0254: 8323276: StressDirListings.java fails on AIX
  • d4823c2: 8322477: order of subclasses in the permits clause can differ between compilations
  • 0b01feb: 8319757: java/nio/channels/DatagramChannel/InterruptibleOrNot.java failed: wrong exception thrown
  • e7994c1: 8303525: Refactor/cleanup open/test/jdk/javax/rmi/ssl/SSLSocketParametersTest.java
  • 5838aed: 8314824: Fix serviceability/jvmti/8036666/GetObjectLockCount.java to use vm flags
  • 45e20c5: 8311792: java/net/httpclient/ResponsePublisher.java fails intermittently with AssertionError: Found some outstanding operations
  • 2267292: 8310070: Test: javax/net/ssl/DTLS/DTLSWontNegotiateV10.java timed out
  • 47c67bd: 8309763: Move tests in test/jdk/sun/misc/URLClassPath directory to test/jdk/jdk/internal/loader
  • e328bf3: 8325024: java/security/cert/CertPathValidator/OCSP/OCSPTimeout.java incorrect comment information
  • ... and 11 more: https://git.openjdk.org/jdk21u-dev/compare/fdbed07d38d4217d209380544d4447ce9b85bad7...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 added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Mar 7, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Mar 7, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Mar 7, 2024

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

  • ab6e027: 8320712: Rewrite BadFactoryTest in pure Java
  • 40f0254: 8323276: StressDirListings.java fails on AIX
  • d4823c2: 8322477: order of subclasses in the permits clause can differ between compilations
  • 0b01feb: 8319757: java/nio/channels/DatagramChannel/InterruptibleOrNot.java failed: wrong exception thrown
  • e7994c1: 8303525: Refactor/cleanup open/test/jdk/javax/rmi/ssl/SSLSocketParametersTest.java
  • 5838aed: 8314824: Fix serviceability/jvmti/8036666/GetObjectLockCount.java to use vm flags
  • 45e20c5: 8311792: java/net/httpclient/ResponsePublisher.java fails intermittently with AssertionError: Found some outstanding operations
  • 2267292: 8310070: Test: javax/net/ssl/DTLS/DTLSWontNegotiateV10.java timed out
  • 47c67bd: 8309763: Move tests in test/jdk/sun/misc/URLClassPath directory to test/jdk/jdk/internal/loader
  • e328bf3: 8325024: java/security/cert/CertPathValidator/OCSP/OCSPTimeout.java incorrect comment information
  • ... and 11 more: https://git.openjdk.org/jdk21u-dev/compare/fdbed07d38d4217d209380544d4447ce9b85bad7...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 7, 2024

@GoeLin Pushed as commit 315d051.

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

@GoeLin GoeLin deleted the goetz_backport_8314828 branch March 7, 2024 16:41
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.

2 participants