Skip to content

Conversation

@amosshi
Copy link
Contributor

@amosshi amosshi commented Jan 22, 2024

Backport of JDK-8272552

  • The original commit contains 6 files, well this PR only contains 4 of them, because the following 2 files do not exist
  • VerifyWithDefaultArchive.java does not exist in Java 11, it was added by JDK-8264337 since Java 17
  • JCmdTestDynamicDump.java does not exist in Java 11, it was added by JDK-8265393 since Java 17
  • So this is unclean backport

Testing

  • Local: not aplicable - no tests selected
    • MaxMetaspaceSize.java - Test results: no tests selected
    • SharedStrings.java - Test results: no tests selected
    • MoveJDKTest.java - Test results: no tests selected
    • ArchivedModuleWithCustomImageTest.java - Test results: no tests selected
    • test/hotspot/jtreg/runtime/SharedArchiveFile folder - Test results: passed: 1
  • Pipeline: All checks have passed
  • Testing Machine: SAP nightlies passed on 2024-01-25,26

Progress

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

Issue

  • JDK-8272552: mark hotspot runtime/cds tests which ignore external VM flags (Sub-task - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2468

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 22, 2024

👋 Welcome back ashi! 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 989f39f8106a22498053a4ca5f2becf8df5f2420 8272552: mark hotspot runtime/cds tests which ignore external VM flags Jan 22, 2024
@openjdk
Copy link

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

mlbridge bot commented Jan 22, 2024

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

The description at the beginning references the wrong issue ("Backport of"), but the backport looks good.

@openjdk
Copy link

openjdk bot commented Jan 27, 2024

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

@amosshi
Copy link
Contributor Author

amosshi commented Jan 28, 2024

/approval request “Backporting for parity with jdk 11.0.22-oracle. No risk, test fix. Un-Clean backport. SAP nightlies passed on 2024-01-25,26”

@openjdk
Copy link

openjdk bot commented Jan 28, 2024

@amosshi
8272552: The approval request has been created successfully.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Jan 28, 2024
@amosshi
Copy link
Contributor Author

amosshi commented Jan 28, 2024

/approval request “Backporting for parity with jdk 11.0.22-oracle. No risk, test fix. Un-Clean backport. SAP nightlies passed on 2024-01-25,26”

@openjdk
Copy link

openjdk bot commented Jan 28, 2024

@amosshi
8272552: The approval request has been updated successfully.

@GoeLin
Copy link
Member

GoeLin commented Jan 29, 2024

I ran the tests on a linux box, they all pass.

@openjdk
Copy link

openjdk bot commented Jan 29, 2024

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

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

8272552: mark hotspot runtime/cds tests which ignore external VM flags

Reviewed-by: mdoerr

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

  • 26d795d: 8324184: Windows VS2010 build failed with "error C2275: 'int64_t'"
  • 82a1501: 8324659: GHA: Generic jtreg errors are not reported
  • b4f6177: 8315761: Open source few swing JList and JMenuBar tests
  • fbc6005: 8318971: Better Error Handling for Jar Tool When Processing Non-existent Files
  • ec4e75d: 8308245: Add -proc:full to describe current default annotation processing policy
  • bee8d32: 8316947: Write a test to check textArea triggers MouseEntered/MouseExited events properly
  • d3675a0: 8253739: java/awt/image/MultiResolutionImage/MultiResolutionImageObserverTest.java fails
  • 3f42f4c: 8244679: JVM/TI GetCurrentContendedMonitor/contmon001 failed due to "(IsSameObject#3) unexpected monitor object: 0x000000562336DBA8"
  • 6e850f3: 8310238: [test bug] javax/swing/JTableHeader/6889007/bug6889007.java fails
  • 1c12d16: 8318410: jdk/java/lang/instrument/BootClassPath/BootClassPathTest.sh fails on Japanese Windows
  • ... and 2 more: https://git.openjdk.org/jdk11u-dev/compare/ef2463415113e0025357824b75e68583e1e90a18...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@TheRealMDoerr) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@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 Jan 29, 2024
@amosshi
Copy link
Contributor Author

amosshi commented Jan 29, 2024

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jan 29, 2024
@openjdk
Copy link

openjdk bot commented Jan 29, 2024

@amosshi
Your change (at version 95ba9de) is now ready to be sponsored by a Committer.

@GoeLin
Copy link
Member

GoeLin commented Jan 30, 2024

/sponsor

@openjdk
Copy link

openjdk bot commented Jan 30, 2024

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

  • a4d416e: 8272335: runtime/cds/appcds/MoveJDKTest.java doesn't check exit codes
  • c9a30d0: 8246222: Rename javac test T6395981.java to be more informative
  • 6360095: 8315034: File.mkdirs() occasionally fails to create folders on Windows shared folder
  • 26d795d: 8324184: Windows VS2010 build failed with "error C2275: 'int64_t'"
  • 82a1501: 8324659: GHA: Generic jtreg errors are not reported
  • b4f6177: 8315761: Open source few swing JList and JMenuBar tests
  • fbc6005: 8318971: Better Error Handling for Jar Tool When Processing Non-existent Files
  • ec4e75d: 8308245: Add -proc:full to describe current default annotation processing policy
  • bee8d32: 8316947: Write a test to check textArea triggers MouseEntered/MouseExited events properly
  • d3675a0: 8253739: java/awt/image/MultiResolutionImage/MultiResolutionImageObserverTest.java fails
  • ... and 5 more: https://git.openjdk.org/jdk11u-dev/compare/ef2463415113e0025357824b75e68583e1e90a18...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 30, 2024

@GoeLin @amosshi Pushed as commit c97f19a.

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

@amosshi amosshi deleted the backport-8272552 branch February 1, 2024 01:06
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 integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants