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

8321812: Update GC tests to use execute[Limited]TestJava #594

Closed
wants to merge 1 commit into from

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented May 21, 2024

Mostly clean backport of JDK-8321812.
Manual integration was needed in the following files, but trivial to resolve:
test/hotspot/jtreg/gc/arguments/TestSmallInitialHeapWithLargePageAndNUMA.java
test/hotspot/jtreg/gc/g1/TestEvacuationFailure.java
test/hotspot/jtreg/gc/g1/TestGCLogMessages.java
test/hotspot/jtreg/gc/g1/TestLargePageUseForAuxMemory.java
test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java
TestAllocationFailure.java was renamed from TestEvacuationFailure.java by JDK-8319313.
Skipped hunks which belong to openjdk/jdk@38cfb22 (not in 21).


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
  • JDK-8321812 needs maintainer approval

Issue

  • JDK-8321812: Update GC tests to use execute[Limited]TestJava (Enhancement - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 594

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 21, 2024

👋 Welcome back mdoerr! 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 May 21, 2024

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

8321812: Update GC tests to use execute[Limited]TestJava

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

  • acff39d: 8319338: tools/jpackage/share/RuntimeImageTest.java fails with -XX:+UseZGC
  • a1e0c5d: 8332253: Linux arm32 build fails after 8292591
  • 8ff8163: 8331466: Problemlist serviceability/dcmd/gc/RunFinalizationTest.java on generic-all

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 changed the title Backport 1d1cd32bc355a33448d8f15555e142570bb49c21 8321812: Update GC tests to use execute[Limited]TestJava May 21, 2024
@openjdk
Copy link

openjdk bot commented May 21, 2024

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

@openjdk openjdk bot added the backport label May 21, 2024
@TheRealMDoerr TheRealMDoerr marked this pull request as ready for review May 21, 2024 19:32
@openjdk openjdk bot added the rfr Pull request is ready for review label May 21, 2024
@mlbridge
Copy link

mlbridge bot commented May 21, 2024

Webrevs

@MBaesken
Copy link
Member

test/hotspot/jtreg/gc/testlibrary/Helpers.java

first hunk throws Exception now (not IOException) see javadoc ; but this is wrong already in the original change not the backport so a separate JBS issue should be filed .

@openjdk
Copy link

openjdk bot commented May 22, 2024

⚠️ @TheRealMDoerr 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.

@TheRealMDoerr
Copy link
Contributor Author

/approval request This GC test cleanup change has been backported to 21.0.5-oracle. We should have it in order to reduce merge conflicts with other backports. It only touches test files and the change is simple, but changes many files. Most of it applies cleanly and the PR with a few manual integrations has been reviewed. Tier 1-4 tests have passed.

@openjdk
Copy link

openjdk bot commented May 22, 2024

@TheRealMDoerr
8321812: The approval request has been created successfully.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels May 22, 2024
@TheRealMDoerr
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented May 23, 2024

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

  • a4d2a5a: 8312194: test/hotspot/jtreg/applications/ctw/modules/jdk_crypto_ec.java cannot handle empty modules
  • 201e663: 8320681: [macos] Test tools/jpackage/macosx/MacAppStoreJlinkOptionsTest.java timed out on macOS
  • fe4a2ae: 8329109: Threads::print_on() tries to print CPU time for terminated GC threads
  • cdfe2f4: 8329840: Fix ZPhysicalMemorySegment::_end type
  • acff39d: 8319338: tools/jpackage/share/RuntimeImageTest.java fails with -XX:+UseZGC
  • a1e0c5d: 8332253: Linux arm32 build fails after 8292591
  • 8ff8163: 8331466: Problemlist serviceability/dcmd/gc/RunFinalizationTest.java on generic-all

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 23, 2024

@TheRealMDoerr Pushed as commit 9035981.

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

@TheRealMDoerr TheRealMDoerr deleted the 8321812_GC_tests branch May 23, 2024 13:58
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