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

8272291: mark hotspot runtime/logging tests which ignore external VM flags #5075

Closed
wants to merge 3 commits into from

Conversation

@iignatev
Copy link
Member

@iignatev iignatev commented Aug 10, 2021

Hi all,

could you please review the patch that adds @requires vm.flagless to 23 hotspot runtime/logging tests that ignore external VM flags?

Thanks,
-- Igor


Progress

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

Issue

  • JDK-8272291: mark hotspot runtime/logging tests which ignore external VM flags

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5075

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 10, 2021

👋 Welcome back iignatyev! 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.

Loading

@openjdk openjdk bot changed the title 8272291 8272291: mark hotspot runtime/logging tests which ignore external VM flags Aug 10, 2021
@openjdk openjdk bot added the rfr label Aug 10, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 10, 2021

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

  • hotspot-runtime

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.

Loading

@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 10, 2021

Webrevs

Loading

Copy link
Member

@mseledts mseledts left a comment

Looks good.

Loading

@iignatev
Copy link
Member Author

@iignatev iignatev commented Aug 12, 2021

Thanks, Misha.

can I also get a Review from a Reviewer?

-- Igor

Loading

@iignatev
Copy link
Member Author

@iignatev iignatev commented Aug 16, 2021

ping?

Loading

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Hi Igor,

There are a couple of changes to existing @requires that I don't agree with. Otherwise all seems okay.

Thanks,
David

Loading

@@ -25,7 +25,7 @@
/*
* @test ClassLoadUnloadTest
* @bug 8142506
* @requires vm.opt.final.ClassUnloading
Copy link
Member

@dholmes-ora dholmes-ora Aug 17, 2021

Choose a reason for hiding this comment

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

The new requirement is weaker than the old. If ClassUnloading were not enabled by default then this test would now run when it should not.

Loading

Copy link
Member Author

@iignatev iignatev Aug 17, 2021

Choose a reason for hiding this comment

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

nice catch, I guess I assumed that the test makes sure its child JVMs are run in the correct setting (as CompressedOopsTest.java does). I'll update the test to pass -XX:+ClassUnloading in ClassLoadUnloadTest::exec.

Loading

Copy link
Member

@dholmes-ora dholmes-ora Aug 17, 2021

Choose a reason for hiding this comment

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

They are not exactly equivalent conditions, but when combined with vm.flagless this change seems okay.

Loading

* @requires vm.bits == 64 & vm.opt.final.UseCompressedOops == true
* @requires vm.bits == 64
* @requires vm.flagless
Copy link
Member

@dholmes-ora dholmes-ora Aug 17, 2021

Choose a reason for hiding this comment

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

Similar comment here, you have weakened the condition that enables the test.

Loading

Copy link
Member Author

@iignatev iignatev Aug 17, 2021

Choose a reason for hiding this comment

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

this test explicitly passes -XX:+UseCompressedOops to a child JVM, so the condition hasn't been weakened, if anything this change increases the coverage for JVMs where UseCompressedOops isn't true by default as now the test will be included in out-of-box runs.

Loading

Copy link
Member

@dholmes-ora dholmes-ora Aug 17, 2021

Choose a reason for hiding this comment

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

Okay. Thinking more about this case I think the old condition was to stop this test from being run when compressed oops was actually disabled, because it was going to enable them anyway. But now vm.flagless takes care of that case.

Loading

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Comments below but good to go.

Thanks,
David

Loading

@@ -25,7 +25,7 @@
/*
* @test ClassLoadUnloadTest
* @bug 8142506
* @requires vm.opt.final.ClassUnloading
Copy link
Member

@dholmes-ora dholmes-ora Aug 17, 2021

Choose a reason for hiding this comment

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

They are not exactly equivalent conditions, but when combined with vm.flagless this change seems okay.

Loading

* @requires vm.bits == 64 & vm.opt.final.UseCompressedOops == true
* @requires vm.bits == 64
* @requires vm.flagless
Copy link
Member

@dholmes-ora dholmes-ora Aug 17, 2021

Choose a reason for hiding this comment

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

Okay. Thinking more about this case I think the old condition was to stop this test from being run when compressed oops was actually disabled, because it was going to enable them anyway. But now vm.flagless takes care of that case.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Aug 17, 2021

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

8272291: mark hotspot runtime/logging tests which ignore external VM flags

Reviewed-by: mseledtsov, dholmes

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

  • 989f39f: 8272552: mark hotspot runtime/cds tests which ignore external VM flags
  • ee8bf10: 8272327: Shenandoah: Avoid enqueuing duplicate string candidates
  • 3fb1927: 8271227: Missing {@code } in com.sun.source.*
  • a5ad772: 8272342: [TEST_BUG] java/awt/print/PrinterJob/PageDialogMarginTest.java catches all exceptions
  • ae45592: 8272374: doclint should report missing "body" comments
  • b2c272d: 8272305: several hotspot runtime/modules don't check exit codes
  • 8268825: 8272297: FileInputStream should override transferTo() for better performance
  • 3677734: 8271471: [IR Framework] Rare occurrence of "" in PrintIdeal/PrintOptoAssembly can let tests fail
  • 0a03481: 8272231: G1: Refactor G1CardSet::get_card_set to return G1CardSetHashTableValue*
  • 83d0e12: 8267833: Improve G1CardSetInlinePtr::add()
  • ... and 58 more: https://git.openjdk.java.net/jdk/compare/abdc1074dcefda9012bb4d84c9f34a2dca5ea560...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.

Loading

@openjdk openjdk bot added the ready label Aug 17, 2021
@iignatev
Copy link
Member Author

@iignatev iignatev commented Aug 17, 2021

David, thank you for the review.

/integrate

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Aug 17, 2021

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

  • a68b5b9: 8272369: java/io/File/GetXSpace.java failed with "RuntimeException: java.nio.file.NoSuchFileException: /run/user/0"
  • a199ebc: 8272581: sun/security/pkcs11/Provider/MultipleLogins.sh fails after JDK-8266182
  • 1cbf41a: 8225083: Remove Google certificate that is expiring in December 2021
  • cf64c3e: 8272326: java/util/Random/RandomTestMoments.java had two Gaussian fails
  • 2ed7b70: 8272521: Remove unused PSPromotionManager::_claimed_stack_breadth
  • 2aaf795: 8272520: Inline GenericTaskQueue::initialize() to the constructor
  • ed57cf1: 8266182: Automate manual steps listed in the test jdk/sun/security/pkcs12/ParamsTest.java
  • 0e3fde6: 8264274: Block tags in overview.html are ignored
  • c5c84b8: 8270312: Error: Not a test or directory containing tests: java/awt/print/PrinterJob/XparColor.java
  • df1427b: 8272446: C1: Raw version of UnsafeGet generates load barriers
  • ... and 68 more: https://git.openjdk.java.net/jdk/compare/abdc1074dcefda9012bb4d84c9f34a2dca5ea560...master

Your commit was automatically rebased without conflicts.

Loading

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

@openjdk openjdk bot commented Aug 17, 2021

@iignatev Pushed as commit 05d64da.

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

Loading

@iignatev iignatev deleted the 8272291 branch Aug 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants