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

8244010: Simplify usages of ProcessTools.createJavaProcessBuilder in our tests #1397

Closed
wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Oct 7, 2022

I backport this for parity with 11.0.17-oracle.

test/hotspot/jtreg/compiler/graalunit/common/GraalUnitTestLauncher.java
Simple resolve due to context

test/hotspot/jtreg/compiler/linkage/TestLinkageErrorInGenerateOopMap.java
Flags differ. Resolved.

test/hotspot/jtreg/compiler/loopstripmining/CheckLoopStripMining.java
Change already in 11. Skipped.

test/hotspot/jtreg/gc/arguments/TestMaxRAMFlags.java
Test not in 11, skipped.

test/hotspot/jtreg/gc/arguments/TestSoftMaxHeapSizeFlag.java
Test was added in 13. skipped.

test/hotspot/jtreg/gc/g1/TestMarkStackSizes.java
Test was added in 15 by 8238855: Move G1ConcurrentMark flag sanity checks to g1Arguments

test/hotspot/jtreg/gc/metaspace/TestSizeTransitions.java
Test was added in 14 by 8227179: Test for new gc+metaspace=info output format

nvdimm tests not i 11

test/hotspot/jtreg/gc/z/TestAllocateHeapAt.java
Test was added in 15 by 8239129: ZGC: Allow -XX:AllocateHeapAt to use any filesystem

test/hotspot/jtreg/gc/z/TestHighUsage.java
Test was added in 13 by 8224185: ZGC: Introduce "High Usage" rule

test/hotspot/jtreg/gc/z/TestSmallHeap.java
Test was added in 14 by 8234338: ZGC: Improve small heap usage

test/hotspot/jtreg/runtime/Shutdown/ShutdownTest.java
Test was added in 13 by 8074355: make MutexLocker smarter about non-JavaThreads

test/hotspot/jtreg/runtime/cds/MaxMetaspaceSize.java
In 11, the test is at test/hotspot/jtreg/runtime/SharedArchiveFile/MaxMetaspaceSize.java
It was moved in 14 by 8202339: [TESTBUG] Consolidate the tests in runtime/SharedArchiveFile and runtime/appcds
Applied patch by hand.

test/hotspot/jtreg/runtime/cds/appcds/TestCommon.javaj
In 11, the test is in test/hotspot/jtreg/runtime/appcds/TestCommon.java
It was moved in 14 by 8202339: [TESTBUG] Consolidate the tests in runtime/SharedArchiveFile and runtime/appcds
Applied patch by hand. In addition, I removed makeCommandLineForAppCDS()

test/hotspot/jtreg/runtime/records/RedefineRecord.java
Skipped. Feature and test not in 11.

test/hotspot/jtreg/serviceability/logging/TestLogRotation.java
Arguments used differ. Resolved. Probably clean after pushing 8243568.

test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSize.java
test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSizeForInterface.java
Resolved due to 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-8244010: Simplify usages of ProcessTools.createJavaProcessBuilder in our tests

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1397

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 7, 2022

👋 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 8244010 Backport 35af52dd4f5e05d5c9cd65db92f23b136404d157 Oct 8, 2022
@openjdk openjdk bot changed the title Backport 35af52dd4f5e05d5c9cd65db92f23b136404d157 8244010: Simplify usages of ProcessTools.createJavaProcessBuilder in our tests Oct 8, 2022
@openjdk
Copy link

openjdk bot commented Oct 8, 2022

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 Oct 8, 2022
@mlbridge
Copy link

mlbridge bot commented Oct 8, 2022

Webrevs

@GoeLin GoeLin changed the base branch from master to pr/1395 October 8, 2022 17:50
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/1395 to master October 10, 2022 07:35
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout goetz_backport_8244010
git fetch https://git.openjdk.org/jdk11u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Oct 10, 2022

@GoeLin this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout goetz_backport_8244010
git fetch https://git.openjdk.org/jdk11u-dev master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Oct 10, 2022
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Oct 10, 2022
Copy link
Member

@MBaesken MBaesken left a comment

Choose a reason for hiding this comment

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

thanks for backporting , looks okay.

@openjdk
Copy link

openjdk bot commented Oct 11, 2022

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

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

8244010: Simplify usages of ProcessTools.createJavaProcessBuilder in our tests

Reviewed-by: mbaesken

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

  • dde80ab: 8129827: [TEST_BUG] Test java/awt/Robot/RobotWheelTest/RobotWheelTest.java fails
  • 380cbc8: 8284521: Write an automated regression test for RFE 4371575
  • a6fafe8: 8284884: Replace polling with waiting in javax/swing/text/html/parser/Parser/8078268/bug8078268.java
  • 01d99fa: 8284732: FFI_GO_CLOSURES macro not defined but required for zero build on Mac OS X
  • fbaf2f2: 8282640: Create a test for JDK-4740761
  • 01cc71f: 8284294: Create an automated regression test for RFE 4138746
  • 910546f: 8283422: Create a new test for JDK-8254790
  • 0910bdb: 8282046: Create a regression test for JDK-8000326
  • ec5041e: 8282936: Write a regression test for JDK-4615365
  • 5a3e86c: 7001973: java/awt/Graphics2D/CopyAreaOOB.java fails
  • ... and 10 more: https://git.openjdk.org/jdk11u-dev/compare/094ca7153a44cadde4c694e81e512708550b2a9a...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 Oct 11, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Oct 11, 2022

Thanks for tackling this tedious change :)

@GoeLin
Copy link
Member Author

GoeLin commented Oct 12, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Oct 12, 2022

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

  • 605e390: 8281296: Create a regression test for JDK-4515999
  • f67b4de: 8294357: (tz) Update Timezone Data to 2022d
  • 4566c88: 8233558: [TESTBUG] WindowOwnedByEmbeddedFrameTest.java fails on macos
  • 4be6963: 8159599: [TEST_BUG] java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java
  • dde80ab: 8129827: [TEST_BUG] Test java/awt/Robot/RobotWheelTest/RobotWheelTest.java fails
  • 380cbc8: 8284521: Write an automated regression test for RFE 4371575
  • a6fafe8: 8284884: Replace polling with waiting in javax/swing/text/html/parser/Parser/8078268/bug8078268.java
  • 01d99fa: 8284732: FFI_GO_CLOSURES macro not defined but required for zero build on Mac OS X
  • fbaf2f2: 8282640: Create a test for JDK-4740761
  • 01cc71f: 8284294: Create an automated regression test for RFE 4138746
  • ... and 14 more: https://git.openjdk.org/jdk11u-dev/compare/094ca7153a44cadde4c694e81e512708550b2a9a...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 12, 2022

@GoeLin Pushed as commit 64a3b18.

💡 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_8244010 branch October 12, 2022 08:53
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