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

8273522: Rename test property vm.cds.archived.java.heap to vm.cds.write.archived.java.heap #5455

Conversation

iklam
Copy link
Member

@iklam iklam commented Sep 9, 2021

The vm.cds.archived.java.heap test property (see test/jtreg-ext/requires/VMProps.java) is ambiguous -- after JDK-8270489, there are now two distinct capabilities:

  • HeapShared::can_write() -- G1 only
  • HeapShared::can_read() -- G1, Epsilon

A few CDS tests are marked with

@requires vm.cds.archived.java.heap

These tests actually require the VM to be able to write Java objects into the CDS archive. Therefore, for clarify, they should be changed to use

@requires vm.cds.write.archived.java.heap

This fix is required for JDK-8273508 - "Support archived heap objects in SerialGC".

Without this fix, tests marked with @requires vm.cds.archived.java.heap would be executed even if SerialGC is selected, but this will dump CDS archives without archived heap objects, causing the tests to fail.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8273522: Rename test property vm.cds.archived.java.heap to vm.cds.write.archived.java.heap

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5455/head:pull/5455
$ git checkout pull/5455

Update a local copy of the PR:
$ git checkout pull/5455
$ git pull https://git.openjdk.java.net/jdk pull/5455/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5455

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5455.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 9, 2021

👋 Welcome back iklam! 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 openjdk bot commented Sep 9, 2021

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

  • hotspot

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 label Sep 9, 2021
@iklam
Copy link
Member Author

@iklam iklam commented Sep 9, 2021

/label remove hotspot
/label add hotspot-runtime

@openjdk openjdk bot removed the hotspot label Sep 9, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 9, 2021

@iklam
The hotspot label was successfully removed.

@openjdk openjdk bot added the hotspot-runtime label Sep 9, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 9, 2021

@iklam
The hotspot-runtime label was successfully added.

@iklam iklam marked this pull request as ready for review Sep 9, 2021
@openjdk openjdk bot added the rfr label Sep 9, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 9, 2021

Webrevs

yminqi
yminqi approved these changes Sep 9, 2021
Copy link
Contributor

@yminqi yminqi left a comment

LGTM.

@openjdk
Copy link

@openjdk openjdk bot commented Sep 9, 2021

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

8273522: Rename test property vm.cds.archived.java.heap to vm.cds.write.archived.java.heap

Reviewed-by: minqi, ccheung, mseledtsov

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

  • f42b927: 8273609: Fix trivial doc typos in the compiler area
  • e4cd209: 8273611: Remove unused ProfilePrint_lock
  • f690a01: 8273278: Support XSLT on GraalVM Native Image--deterministic bytecode generation in XSLT
  • 5e1df2c: 8273162: AbstractSplittableWithBrineGenerator does not create a random salt
  • d4177a9: 8273351: bad tag in jdk.random module-info.java
  • ec9d1be: 8273194: Document the two possible cases when Lookup::ensureInitialized returns
  • 81d2ace: 8273369: Computing micros between two instants unexpectedly overflows for some cases
  • efe3ed1: 8273358: macOS Monterey does not have the font Times needed by Serif
  • e58c12e: 8273512: Fix the copyright header of x86 macroAssembler files
  • 461a467: 8273456: Do not hold ttyLock around stack walking
  • ... and 29 more: https://git.openjdk.java.net/jdk/compare/5df26480864f1efd16eb5800833bf7106371b97a...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 the ready label Sep 9, 2021
Copy link
Member

@calvinccheung calvinccheung left a comment

LGTM.

Copy link
Member

@mseledts mseledts left a comment

Looks good.

@iklam
Copy link
Member Author

@iklam iklam commented Sep 10, 2021

Thanks @calvinccheung @yminqi @mseledts for the review.
/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Sep 10, 2021

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

  • f42b927: 8273609: Fix trivial doc typos in the compiler area
  • e4cd209: 8273611: Remove unused ProfilePrint_lock
  • f690a01: 8273278: Support XSLT on GraalVM Native Image--deterministic bytecode generation in XSLT
  • 5e1df2c: 8273162: AbstractSplittableWithBrineGenerator does not create a random salt
  • d4177a9: 8273351: bad tag in jdk.random module-info.java
  • ec9d1be: 8273194: Document the two possible cases when Lookup::ensureInitialized returns
  • 81d2ace: 8273369: Computing micros between two instants unexpectedly overflows for some cases
  • efe3ed1: 8273358: macOS Monterey does not have the font Times needed by Serif
  • e58c12e: 8273512: Fix the copyright header of x86 macroAssembler files
  • 461a467: 8273456: Do not hold ttyLock around stack walking
  • ... and 29 more: https://git.openjdk.java.net/jdk/compare/5df26480864f1efd16eb5800833bf7106371b97a...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 10, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Sep 10, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 10, 2021

@iklam Pushed as commit 922e86f.

💡 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
hotspot-runtime integrated
5 participants