Skip to content

Conversation

@jianglizhou
Copy link
Contributor

@jianglizhou jianglizhou commented Feb 22, 2025

Please review the fix in following tests to not check for shared libraries when running on static JDK:

test/hotspot/jtreg/serviceability/dcmd/vm/DynLibsTest.java
test/hotspot/jtreg/serviceability/dcmd/vm/SystemDumpMapTest.java
test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTest.java


Progress

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

Issue

  • JDK-8350524: Some hotspot/jtreg/serviceability/dcmd/vm tier1 tests fail on static JDK (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/23734/head:pull/23734
$ git checkout pull/23734

Update a local copy of the PR:
$ git checkout pull/23734
$ git pull https://git.openjdk.org/jdk.git pull/23734/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23734

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/23734.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 22, 2025

👋 Welcome back jiangli! 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 bot commented Feb 22, 2025

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

8350524: Some hotspot/jtreg/serviceability/dcmd/vm tier1 tests fail on static JDK

Reviewed-by: stuefe

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

  • a7a09f6: 8349632: RISC-V: Add Zfa fminm/fmaxm
  • 0454406: 8351987: ProblemList the failing JFR streaming tests on macOS
  • be36b23: 8351778: JIT compiler fails when running -XX:AOTMode=create
  • 7fc776e: 8270265: LineBreakMeasurer calculates incorrect line breaks with zero-width characters
  • 3da5e3f: 8349350: Unable to print using InputSlot and OutputBin print attributes at the same time
  • aa047ee: 8319192: Remove javax.swing.plaf.synth.SynthLookAndFeel.load(URL url)
  • cd1be91: 8319055: JCMD should not buffer the whole output of commands
  • 248c373: 8351266: JFR: -XX:StartFlightRecording:report-on-exit
  • 03ef79c: 8346470: Improve WriteBarrier JMH to have old-to-young refs
  • b50fe9b: 8280818: Expand bug8033699.java to iterate over all LaFs
  • ... and 251 more: https://git.openjdk.org/jdk/compare/25322aae8e224680db376098d2e45f26cf3334a0...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 rfr Pull request is ready for review label Feb 22, 2025
@openjdk
Copy link

openjdk bot commented Feb 22, 2025

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

  • serviceability

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 serviceability serviceability-dev@openjdk.org label Feb 22, 2025
@mlbridge
Copy link

mlbridge bot commented Feb 22, 2025

Webrevs

@jianglizhou
Copy link
Contributor Author

@tstuefe Could you please help review these test changes? Looking at the file history, I see you added the SystemDumpMapTest.java and SystemMapTest.java. Thanks

@AlanBateman
Copy link
Contributor

I'm not familiar with details of the output from the System.map command but the change looks reasonable, hopefully @tstuefe or someone familar with this command and these tests can review.

@jianglizhou
Copy link
Contributor Author

I'm not familiar with details of the output from the System.map command but the change looks reasonable, hopefully @tstuefe or someone familar with this command and these tests can review.

Thanks, @AlanBateman!

Could anyone help review this change as well? Thanks!

Copy link
Member

@tstuefe tstuefe left a comment

Choose a reason for hiding this comment

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

Small nits, otherwise fine.

// libjvm
regexBase_committed + "/lib/.*/libjvm.so"
};

Copy link
Member

Choose a reason for hiding this comment

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

Nit, misnamed, since its not unconditionally anymore.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done. Also renamed for other OSs.

return shouldMatchUnconditionally_linux;
} else {
return StringArrayUtils.concat(shouldMatchUnconditionally_linux,
shouldMatchUnconditionally_linux_libjvm);
Copy link
Member

Choose a reason for hiding this comment

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

Here, and in DumpTest: please provide a short comment about why we don't want to match libjvm (even if it seems obvious).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Add comments. Please let me know if that covers all cases in your suggestion.

@tstuefe Could you please approve again after the updates? Thanks for the review!

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 13, 2025
- Renamed shouldMatchUnconditionally_<os>_libjvm to shouldMatch_<os>_libjvm in SystemMapTestBase.
- Added comments to shouldMatchUnconditionally() methods for difference OS cases in SystemMapTestBase.
- Added comments to DynLibsTest.java.
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Mar 13, 2025
Copy link
Member

@tstuefe tstuefe left a comment

Choose a reason for hiding this comment

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

Good, thanks for addressing the nits

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 14, 2025
@jianglizhou
Copy link
Contributor Author

Thanks, @tstuefe!

@jianglizhou
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 14, 2025

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

  • 712a70c: 8318220: RISC-V: C2 ReverseI
  • 985ca12: 8352011: RISC-V: Two IR tests fail after JDK-8351662
  • 86b2433: 8352050: Problem list compiler/ciReplay/* test until JDK-8349191 is fixed
  • 65c5282: 8351938: C2: Print compilation bailouts with PrintCompilation compile command
  • e3c29c9: 8351556: Optimize Location.locationFor/isModuleOrientedLocation
  • a7a09f6: 8349632: RISC-V: Add Zfa fminm/fmaxm
  • 0454406: 8351987: ProblemList the failing JFR streaming tests on macOS
  • be36b23: 8351778: JIT compiler fails when running -XX:AOTMode=create
  • 7fc776e: 8270265: LineBreakMeasurer calculates incorrect line breaks with zero-width characters
  • 3da5e3f: 8349350: Unable to print using InputSlot and OutputBin print attributes at the same time
  • ... and 256 more: https://git.openjdk.org/jdk/compare/25322aae8e224680db376098d2e45f26cf3334a0...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 14, 2025
@openjdk openjdk bot closed this Mar 14, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 14, 2025
@openjdk
Copy link

openjdk bot commented Mar 14, 2025

@jianglizhou Pushed as commit 7f42804.

💡 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

integrated Pull request has been integrated serviceability serviceability-dev@openjdk.org

Development

Successfully merging this pull request may close these issues.

3 participants