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

8321713: Harmonize executeTestJvm with create[Limited]TestJavaProcessBuilder #520

Closed
wants to merge 2 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Apr 22, 2024

I backport this for parity with Oracle.

File not in 21:
test/hotspot/jtreg/compiler/compilercontrol/commands/MemLimitTest.java
was added by "8319301: Static analysis warnings after JDK-8318016" in 22.
test/hotspot/jtreg/compiler/compilercontrol/commands/MemStatTest.java
Was added by "8318671: Potential uninitialized uintx value after JDK-8317683".
"8317683 Add JIT memory statistics" was added in 22.

test/hotspot/jtreg/compiler/compilercontrol/commands/OptionTest.java
Resolved because "8282797: CompileCommand parsing errors should exit VM" is only in 22.
It has a CSR and modifies behaviour, so not a good candidate to backport as prereq.

File not in 21:
test/hotspot/jtreg/compiler/print/CompileCommandMemLimit.java
Added by "8318016: Per-compilation memory ceiling" in 22.
test/hotspot/jtreg/compiler/print/CompileCommandPrintMemStat.java
Added by "8317683 Add JIT memory statistics" in 22.

test/hotspot/jtreg/compiler/vectorapi/TestVectorErgonomics.java
Resolved because some Vector API changes are not in 21.

File not in 21:
test/hotspot/jtreg/runtime/ErrorHandling/UncaughtNativeExceptionTest.java
Added in 22 by "8310228: Improve error reporting for uncaught native exceptions on Windows"

I had to edit two additional files.
I could not execute hotspot/jtreg/gc/z/TestHighUsage.java, but the edit is trivial enough to
skip this.
compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java fails in an unrelated way but it is on the
ProblemList anyways.
Other tests or tests using the edited class pass.


Progress

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

Issue

  • JDK-8321713: Harmonize executeTestJvm with create[Limited]TestJavaProcessBuilder (Enhancement - P4 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/520/head:pull/520
$ git checkout pull/520

Update a local copy of the PR:
$ git checkout pull/520
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/520/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 520

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/520.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 22, 2024

👋 Welcome back goetz! 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 Apr 22, 2024

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

8321713: Harmonize executeTestJvm with create[Limited]TestJavaProcessBuilder

Reviewed-by: lucy

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

  • 2331bc7: 8329013: StackOverflowError when starting Apache Tomcat with signed jar
  • 68d0925: 8324933: ConcurrentHashTable::statistics_calculate synchronization is expensive
  • 2626d73: 8327989: java/net/httpclient/ManyRequest.java should not use "localhost" in URIs
  • 9c0e18c: 8320924: Improve heap dump performance by optimizing archived object checks
  • 41237fc: 8320707: Virtual thread test updates
  • 955fcc1: 8310355: Move the stub test from initialize_final_stubs() to test/hotspot/gtest
  • 031acf1: 8327096: (fc) java/nio/channels/FileChannel/Size.java fails on partition incapable of creating large files
  • 324cef1: 8327971: Multiple ASAN errors reported for metaspace
  • ac402fb: 8293850: need a largest_committed metric for each category of NMT's output
  • febbf35: 8316242: Opensource SwingGraphics manual test
  • ... and 15 more: https://git.openjdk.org/jdk21u-dev/compare/515783b86c5efae1f5385b4bc869869af58cb5bc...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.

@GoeLin GoeLin changed the title Goetz backport 8321713 keep backport cbe329b90ac1488836d4852fead79aa26c082114 Apr 22, 2024
@openjdk openjdk bot changed the title backport cbe329b90ac1488836d4852fead79aa26c082114 8321713: Harmonize executeTestJvm with create[Limited]TestJavaProcessBuilder Apr 22, 2024
@openjdk
Copy link

openjdk bot commented Apr 22, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Apr 22, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 22, 2024

Webrevs

Copy link

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

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

LGTM.

@openjdk
Copy link

openjdk bot commented Apr 25, 2024

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Apr 25, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Apr 29, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Apr 29, 2024

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

  • d8bc9e4: 8331113: createJMHBundle.sh support configurable maven repo mirror
  • d1b97d4: 8309142: Refactor test/langtools/tools/javac/versions/Versions.java
  • e59f4fa: 8328194: Add a test to check default rendering engine
  • 6f07ee4: 8324733: [macos14] Problem list tests which fail due to macOS bug described in JDK-8322653
  • 262cacb: 8320061: [nmt] Multiple issues with peak accounting
  • 1d01cd7: 8315889: Open source several Swing HTMLDocument related tests
  • 2331bc7: 8329013: StackOverflowError when starting Apache Tomcat with signed jar
  • 68d0925: 8324933: ConcurrentHashTable::statistics_calculate synchronization is expensive
  • 2626d73: 8327989: java/net/httpclient/ManyRequest.java should not use "localhost" in URIs
  • 9c0e18c: 8320924: Improve heap dump performance by optimizing archived object checks
  • ... and 21 more: https://git.openjdk.org/jdk21u-dev/compare/515783b86c5efae1f5385b4bc869869af58cb5bc...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 29, 2024

@GoeLin Pushed as commit e7ebae5.

💡 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
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants