-
Notifications
You must be signed in to change notification settings - Fork 6.2k
8311775: [TEST] duplicate verifyHeapDump in several tests #15202
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
Conversation
|
👋 Welcome back yyang! A progress list of the required criteria for merging this PR into |
|
@y1yang0 The following labels will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command. |
|
/label remove hotspot-runtime core-libs |
|
@y1yang0 The |
Webrevs
|
kevinjwalls
left a comment
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.
Looks good to me, thanks.
One question on whether we need to change those "throws IOException" to "throws Exception", which is really me thinking if the existing HProfParser parse method really needs to throw Exception? Maybe it only needs IOException? (snapshot.resolve doesn't throw anything)
But looks good anyway and good to share this code. 8-)
|
Can you clarify what testing you did? I don't see BasicJMapTest.java being run as part of GHA. I also don't see com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java being run, which is impacted by your changes. |
|
Need to update copyright year in the files |
| import jdk.test.lib.hprof.parser.PositionDataInputStream; | ||
| import jdk.test.lib.hprof.HprofParser; |
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.
PositionDataInputStream and HprofParser imports are not used anymore
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 review, all copyright year and unused imports are removed now
|
Thanks for reviews!
Yes, we must change it to /jdk/test/lib/jdk/test/lib/hprof/HprofParser.java:99: error: unreported exception Exception; must be caught or declared to be thrown
try (Snapshot snapshot = Reader.readFile(dump.getAbsolutePath(), callStack, debugLevel)) {
^
exception thrown from implicit call to close() on resource variable 'snapshot'I noticed another optional enhancement where I found that essentially all calls to HprofParser.parse should now be replaced with HprofParser.parseAndVerify or make it the standard parsing logic, but this is unrelated to my current patch.
All involved tests work in Linux. |
|
test/lib/jdk/test/lib/hprof/HprofParser.java needs a copyright update. |
|
@y1yang0 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: 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 291 new commits pushed to the
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 |
|
/integrate |
|
Going to push as commit 75d4ac2.
Your commit was automatically rebased without conflicts. |
This is a follow-up patch of #13667. verifyHeapDump is duplicated in several tests, this patch tries to consolidate them into one method.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/15202/head:pull/15202$ git checkout pull/15202Update a local copy of the PR:
$ git checkout pull/15202$ git pull https://git.openjdk.org/jdk.git pull/15202/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 15202View PR using the GUI difftool:
$ git pr show -t 15202Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/15202.diff
Webrev
Link to Webrev Comment