Skip to content

8244078: ProcessTools executeTestJvm and createJavaProcessBuilder have inconsistent handling of test.*.opts #2000

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 3 commits into from
Closed

8244078: ProcessTools executeTestJvm and createJavaProcessBuilder have inconsistent handling of test.*.opts #2000

wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jun 25, 2023 •
edited by openjdk bot
Loading

I backport this for parity with 11.0.20-oracle.

A row of files are not in 11 or have been moved.
Some trivial resolves were necessary.
An extra commit fixes the remaining occurances.

test/hotspot/jtreg/compiler/graalunit/common/GraalUnitTestLauncher.java
Context

not in 11: test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java
not in 11: test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAt.java
not in 11: test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAtError.java
not in 11: test/hotspot/jtreg/gc/nvdimm/TestAllocateOldGenAtMultiple.java
not in 11: test/hotspot/jtreg/gc/nvdimm/TestHumongousObjectsOnNvdimm.java
not in 11: test/hotspot/jtreg/gc/nvdimm/TestOldObjectsOnNvdimm.java
not in 11: test/hotspot/jtreg/gc/nvdimm/TestYoungObjectsOnDram.java

test/hotspot/jtreg/runtime/7162488/TestUnrecognizedVmOption.java
Later change undoes this, and is already backported (8247741). Skipped.

not in 11: test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java
not in 11: test/hotspot/jtreg/runtime/InvocationTests/invocationGraalTests.java
not in 11: test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java
not in 11: test/hotspot/jtreg/runtime/InvocationTests/invokespecialTests.java
not in 11: test/hotspot/jtreg/runtime/InvocationTests/invokevirtualTests.java

not in 11: test/hotspot/jtreg/runtime/cds/SharedArchiveFile.java
not in 11: test/hotspot/jtreg/runtime/cds/appcds/DumpClassList.java
not in 11: test/hotspot/jtreg/runtime/cds/appcds/GraalWithLimitedMetaspace.java
not in 11: test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java
not in 11: test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveTestBase.java
not in 11: test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/NoClassToArchive.java
not in 11: test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasic.java
not in 11: test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SysDictCrash.java

test/hotspot/jtreg/runtime/handshake/HandshakeTransitionTest.java
Context

test/hotspot/jtreg/serviceability/logging/TestLogRotation.java
Extra empty line.

test/hotspot/jtreg/serviceability/sa/TestJmapCore.java
Context.

not in 11: test/jdk/java/lang/RuntimeTests/shutdown/ShutdownInterruptedMain.java
not in 11: test/jdk/jdk/jfr/api/consumer/streaming/TestCrossProcessStreaming.java
not in 11: test/jdk/jdk/jfr/api/consumer/streaming/TestProcess.java
not in 11: test/jdk/jdk/jfr/event/runtime/TestDumpReason.java
not in 11: test/jdk/jdk/jfr/event/runtime/TestShutdownEvent.java
not in 11: test/jdk/sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java

test/lib/jdk/test/lib/process/ProcessTools.java
Context.

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-8244078: ProcessTools executeTestJvm and createJavaProcessBuilder have inconsistent handling of test.*.opts (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2000

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 25, 2023

👋 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.

@GoeLin GoeLin changed the title Goetz backport 8244078 Backport 81597d9f8fbc40bb1a26ca9fe66ece3caf1c9dda Jun 25, 2023
@openjdk openjdk bot changed the title Backport 81597d9f8fbc40bb1a26ca9fe66ece3caf1c9dda 8244078: ProcessTools executeTestJvm and createJavaProcessBuilder have inconsistent handling of test.*.opts Jun 25, 2023
@openjdk
Copy link

openjdk bot commented Jun 25, 2023

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Jun 25, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 25, 2023 •
edited
Loading

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Jun 28, 2023

To make the tests pass, I include a change to ModuleOptionsTest.java that was done in JDK-8243945.
Also, 8237111 renamed a method in Utils.java to prependTestJavaOpts().
I added a new method with this name and the same implementation so that both names
can be used. Else I need to include large parts of 8237111.

See latest commit.

@GoeLin GoeLin force-pushed the goetz_backport_8244078 branch from 2082918 to 17110e5 Compare June 29, 2023 12:40
@openjdk
Copy link

openjdk bot commented Jun 29, 2023

@GoeLin Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

RealLucy
RealLucy approved these changes Jun 30, 2023
View reviewed changes
Copy link
Contributor

@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.
In the future, we may want to think twice before we backport enhancements with such widespread reach.

@openjdk
Copy link

openjdk bot commented Jun 30, 2023

@GoeLin This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8244078: ProcessTools executeTestJvm and createJavaProcessBuilder have inconsistent handling of test.*.opts

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:

  • 339518e: 8306484: Open source several AWT Choice jtreg tests
  • aa54ef1: 8306682: Open source a few more AWT Choice tests
  • 54cb972: 8298974: Add ftcolor.c to imported freetype sources
  • abfab03: 8228403: SignTwice.java failed with java.io.FileNotFoundException: File name too long
  • 142d467: 8298921: Create a regression test for JDK-8139581
  • d45544d: 8241097: java/math/BigInteger/largeMemory/SymmetricRangeTests.java requires -XX:+CompactStrings
  • 186d04c: 8221372: Test vmTestbase/nsk/jvmti/GetThreadState/thrstat001/TestDescription.java times out
  • b2d9d44: 8299424: containers/docker/TestMemoryWithCgroupV1.java fails on SLES12 ppc64le when testing Memory and Swap Limit
  • 729838b: 8296084: javax/swing/JSpinner/4788637/bug4788637.java fails intermittently on a VM
  • a6d6304: 8223783: sun/net/www/http/HttpClient/MultiThreadTest.java sometimes detect threads+1 connections
  • ... and 15 more: https://git.openjdk.org/jdk11u-dev/compare/cc88f4c77edea84b84dedf2ebf859dd188a55407...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 ready Pull request is ready to be integrated label Jun 30, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Jul 3, 2023

Thanks for reviewing!

@GoeLin
Copy link
Member Author

GoeLin commented Jul 4, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jul 4, 2023

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 4, 2023

@GoeLin Pushed as commit 8528c52.

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

@GoeLin GoeLin deleted the goetz_backport_8244078 branch July 4, 2023 07:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RealLucy RealLucy RealLucy approved these changes

Assignees
No one assigned
Labels
backport Port of a pull request already in a different code base integrated Pull request has been integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@GoeLin @RealLucy