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

8315097: Rename createJavaProcessBuilder #105

Closed
wants to merge 5 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Dec 30, 2023

I backport this to keep the 21u test suite up-to-date. This will simplify future test backports.

I split this into 4 commits:

  1. The clean parts.
  2. The files I resolved.
  3. Follow up change JDK-8318964 needed.
  4. Edit some files that were removed after 21.

Details:

Commit 2:

test/hotspot/jtreg/compiler/compilercontrol/TestConflictInlineCommands.java
Resolved. Later change was backported already.

test/hotspot/jtreg/compiler/jvmci/TestJVMCISavedProperties.java
Test not in 21u.

test/hotspot/jtreg/compiler/rangechecks/TestRangeCheckHoistingScaledIV.java
Resolved. Predecessor 8312522: Implementation of Foreign Function & Memory API cannot be backported.

test/hotspot/jtreg/runtime/CommandLine/DoubleFlagWithIntegerValue.java
Resolved Predecessor 8305506: Add support for fractional values of SafepointTimeoutDelay cannot be backported.

test/hotspot/jtreg/runtime/ErrorHandling/TestAbortVmOnException.java
Resolved. I backported predecessor 8310919 and resolved this on top of that change.
I missed one -Xbatch, removed in commit 5.

test/hotspot/jtreg/runtime/Safepoint/TestAbortVMOnSafepointTimeout.java
Resolved because of 82205507, which cannot be backported, it is a new feature.

test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/LambdasInTwoArchives.java
Test not in 21. Came with 8307468, new feature. Skipped.

test/hotspot/jtreg/runtime/logging/ClassLoadUnloadTest.java
Resolved. Would need several predecessor backports.

test/hotspot/jtreg/runtime/posixSig/TestPosixSig.java
Resolved. Previous change is a new feature, cannot be backported.

test/hotspot/jtreg/runtime/verifier/TestTableSwitch.java
Test not in 21. New feature. Skipped.

Commit 3:

Follow up "8318964: Fix build failures caused by 8315097:"
This change could be applied clean on top of the previous commits except for
the change to
test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointersEncodingScheme.java
which I omitted as the test is not in 21.

Commit 4:

The following files were removed after 21.
I adapted them because they are also using the removed function createJavaProcessBuilder():

test/hotspot/jtreg/gc/arguments/TestArrayAllocatorMallocLimit.java
Removed by 8299915: Remove ArrayAllocatorMallocLimit and associated code. Fixed.

test/hotspot/jtreg/gc/startup_warnings/TestG1.java
test/hotspot/jtreg/gc/startup_warnings/TestParallelGC.java
test/hotspot/jtreg/gc/startup_warnings/TestSerialGC.java
test/hotspot/jtreg/gc/startup_warnings/TestShenandoah.java
Removed by 8311086: Remove jtreg/gc/startup_warnings. Fixed.

test/hotspot/jtreg/runtime/logging/ClassLoadUnloadTest.java
8312049: runtime/logging/ClassLoadUnloadTest can be improved. Fixed.


Progress

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

Issues

  • JDK-8315097: Rename createJavaProcessBuilder (Sub-task - P4 - Approved)
  • JDK-8318964: Fix build failures caused by 8315097 (Bug - P1 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 105

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 30, 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.

@openjdk openjdk bot changed the title Backport d52a995f35de26c2cc4074297a75141e4a363e1b 8315097: Rename createJavaProcessBuilder Dec 30, 2023
@openjdk
Copy link

openjdk bot commented Dec 30, 2023

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 Dec 30, 2023
@mlbridge
Copy link

mlbridge bot commented Dec 30, 2023

Webrevs

I missed this when resolving 8310919
@TheRealMDoerr
Copy link
Contributor

I think this backport makes sense and your resolution looks good. Thanks for describing your steps in detail! Should we use /issue add JDK-8318964 in order to have the backport status tracked correctly by JBS?

@GoeLin
Copy link
Member Author

GoeLin commented Dec 31, 2023

/issue add JDK-8318964

@openjdk
Copy link

openjdk bot commented Dec 31, 2023

@GoeLin
Adding additional issue to issue list: 8318964: Fix build failures caused by 8315097.

@openjdk openjdk bot added the approval label Dec 31, 2023
@openjdk
Copy link

openjdk bot commented Dec 31, 2023

⚠️ @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
Copy link

openjdk bot commented Jan 7, 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:

8315097: Rename createJavaProcessBuilder
8318964: Fix build failures caused by 8315097

Reviewed-by: mdoerr

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

  • 4bdda4b: 8322583: RISC-V: Enable fast class initialization checks
  • b3344f2: 8315731: Open source several Swing Text related tests
  • 49dd575: 8320921: GHA: Parallelize hotspot_compiler test jobs
  • 579c56f: 8322321: Add man page doc for -XX:+VerifySharedSpaces
  • 5f2cf88: 8322159: ThisEscapeAnalyzer crashes for erroneous code
  • 23a0b90: 8319548: Unexpected internal name for Filler array klass causes error in VisualVM
  • 9f60360: 8321974: Crash in ciKlass::is_subtype_of because TypeAryPtr::_klass is not initialized
  • 58b1b0c: 8315042: NPE in PKCS7.parseOldSignedData
  • 57b5147: 8315986: [macos14] javax/swing/JMenuItem/4654927/bug4654927.java: component must be showing on the screen to determine its location
  • 966071a: 8309203: C2: remove copy-by-value of GrowableArray for InterfaceSet
  • ... and 7 more: https://git.openjdk.org/jdk21u-dev/compare/191fc6b50a413cba76eb9f4f3f4f1713cc1e3703...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 ready Pull request is ready to be integrated and removed approval labels Jan 7, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Jan 8, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Jan 8, 2024

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

  • 4bdda4b: 8322583: RISC-V: Enable fast class initialization checks
  • b3344f2: 8315731: Open source several Swing Text related tests
  • 49dd575: 8320921: GHA: Parallelize hotspot_compiler test jobs
  • 579c56f: 8322321: Add man page doc for -XX:+VerifySharedSpaces
  • 5f2cf88: 8322159: ThisEscapeAnalyzer crashes for erroneous code
  • 23a0b90: 8319548: Unexpected internal name for Filler array klass causes error in VisualVM
  • 9f60360: 8321974: Crash in ciKlass::is_subtype_of because TypeAryPtr::_klass is not initialized
  • 58b1b0c: 8315042: NPE in PKCS7.parseOldSignedData
  • 57b5147: 8315986: [macos14] javax/swing/JMenuItem/4654927/bug4654927.java: component must be showing on the screen to determine its location
  • 966071a: 8309203: C2: remove copy-by-value of GrowableArray for InterfaceSet
  • ... and 7 more: https://git.openjdk.org/jdk21u-dev/compare/191fc6b50a413cba76eb9f4f3f4f1713cc1e3703...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 8, 2024

@GoeLin Pushed as commit 1f38afa.

💡 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_8315097 branch January 8, 2024 07:05
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
2 participants