-
Notifications
You must be signed in to change notification settings - Fork 224
8332252: Clean up vmTestbase/vm/share #3640
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
base: master
Are you sure you want to change the base?
Conversation
👋 Welcome back goetz! A progress list of the required criteria for merging this PR into |
❗ This change is not yet ready to be integrated. |
This backport pull request has now been updated with issue from the original commit. |
Webrevs
|
@@ -30,9 +30,6 @@ | |||
* VM Testbase keywords: [nonconcurrent, no_cds] | |||
* | |||
* @comment Don't run test in configurations where we can't reliably count number of metaspace triggered GCs | |||
* @requires vm.gc != null | !vm.opt.final.ClassUnloadingWithConcurrentMark | |||
* @requires vm.gc != "G1" | !vm.opt.final.ClassUnloadingWithConcurrentMark | |||
* @requires vm.gc != "Z" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you explain this change, please? I can't see it in the original change.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for catching this. This sneaked in from another backport. I removed it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
|
I backport this for parity with 17.0.17-oracle.
I had to touch three files:
test/hotspot/jtreg/vmTestbase/metaspace/gc/HighWaterMarkTest.java
Resolved Copyright because "8284853: Fix various 'expected' typo" is not in 17.
test/hotspot/jtreg/vmTestbase/metaspace/staticReferences/StaticReferences.java
Resolved imports because later change "8202100: Merge vm/share/InMemoryJavaCompiler w/ jdk/test/lib/compiler/InMemoryJavaCompiler" was already backported.
test/hotspot/jtreg/vmTestbase/vm/share/ProcessUtils.cpp
Several changes are missing here. These are all cleanups that touch code that is removed anyways.
Resolved.
I ran the modified tests. Where a aux file has been modified, I selected some test that uses the coding as assured it is passing.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/3640/head:pull/3640
$ git checkout pull/3640
Update a local copy of the PR:
$ git checkout pull/3640
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/3640/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 3640
View PR using the GUI difftool:
$ git pr show -t 3640
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/3640.diff
Using Webrev
Link to Webrev Comment