Skip to content

8314495: Update to use jtreg 7.3.1#1712

Closed
shipilev wants to merge 7 commits intoopenjdk:masterfrom
shipilev:JDK-MULTI-JTREG
Closed

8314495: Update to use jtreg 7.3.1#1712
shipilev wants to merge 7 commits intoopenjdk:masterfrom
shipilev:JDK-MULTI-JTREG

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented Aug 30, 2023

Atomically brings jtreg 7.3.1 (current at mainline) to 17u. Depending on new jtreg allows to cleanly backport tests from mainline without rewriting them for older jtreg.

Thankfully, @GoeLin backported all the actual test changes that are needed for this to work.

The uncleanliness comes mostly from the gtest "version" variable conflicts. Otherwise the whole stack applies cleanly.

Additional testing:

  • GHA
  • Linux AArch64 tier1 tier2 tier3 tier4

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-8314495: Update to use jtreg 7.3.1 (Enhancement - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1712

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 30, 2023

👋 Welcome back shade! 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 c50315de8f13d316a7de08be53716cd88fa801c4 8314495: Update to use jtreg 7.3.1 Aug 30, 2023
@openjdk
Copy link

openjdk bot commented Aug 30, 2023

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

@openjdk openjdk bot added the backport Port of a pull request already in a different code base label Aug 30, 2023
@shipilev shipilev marked this pull request as ready for review August 31, 2023 13:46
@shipilev
Copy link
Member Author

I don't really see the point of adding all the relevant "jtreg update" issues to this PR, but I can if anyone has a strong opinion about it. @GoeLin, @RealCLanger?

@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 31, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 31, 2023

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

This makes sense!

@openjdk
Copy link

openjdk bot commented Aug 31, 2023

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

8314495: Update to use jtreg 7.3.1

Reviewed-by: mdoerr, clanger

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

  • f85df30: 8314139: TEST_BUG: runtime/os/THPsInThreadStackPreventionTest.java could fail on machine with large number of cores
  • 8d70429: 8313626: C2 crash due to unexpected exception control flow
  • 7f3f76f: 8286430: make test TEST="gtest:" exits with error when it shouldn't
  • eb639a2: 8312585: Rename DisableTHPStackMitigation flag to THPStackMitigation
  • 804ce09: 8312620: WSL Linux build crashes after JDK-8310233
  • e0b39c7: 8312535: MidiSystem.getSoundbank() throws unexpected SecurityException
  • e6b87a7: 8312182: THPs cause huge RSS due to thread start timing issue
  • fbe3773: 8312394: [linux] SIGSEGV if kernel was built without hugepage support

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 added the ready Pull request is ready to be integrated label Aug 31, 2023
@RealCLanger
Copy link
Contributor

I don't really see the point of adding all the relevant "jtreg update" issues to this PR, but I can if anyone has a strong opinion about it. @GoeLin, @RealCLanger?

No strong opinion, it's fine.

@shipilev
Copy link
Member Author

shipilev commented Sep 5, 2023

Before I integrate, can I ask @TheRealMDoerr @RealCLanger or @GoeLin to run this through their nightly testing too? Don't want to break stuff if we can avoid it.

@TheRealMDoerr
Copy link
Contributor

We already use the new jtreg version for our nightly tests. I've put your PR into our queue.

@shipilev
Copy link
Member Author

shipilev commented Sep 5, 2023

We already use the new jtreg version for our nightly tests. I've put your PR into our queue.

Ah, that would be enough then. I wanted to check if any test does not work with new jtreg, e.g. due to missing testbug backport. If your nightly already passes with 7.3.1, then we are already good.

@TheRealMDoerr
Copy link
Contributor

Test results look good. Your PR is appreciated! But, testing it does not harm. I'll keep it in the queue.

@RealCLanger
Copy link
Contributor

We already use the new jtreg version for our nightly tests. I've put your PR into our queue.

Ah, that would be enough then. I wanted to check if any test does not work with new jtreg, e.g. due to missing testbug backport. If your nightly already passes with 7.3.1, then we are already good.

Yes, we had already switched our testing of JDK 17 and later to 7.3.1 when we saw your PR (Thanks @ArnoZeller). Looks all fine, this PR is good to go from our end.

@shipilev
Copy link
Member Author

shipilev commented Sep 5, 2023

All right then! Here goes.

/integrate

@openjdk
Copy link

openjdk bot commented Sep 5, 2023

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

  • c4612c1: 8207166: jdk/jshell/JdiHangingLaunchExecutionControlTest.java - launch timeout
  • 5b613e3: 8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
  • f85df30: 8314139: TEST_BUG: runtime/os/THPsInThreadStackPreventionTest.java could fail on machine with large number of cores
  • 8d70429: 8313626: C2 crash due to unexpected exception control flow
  • 7f3f76f: 8286430: make test TEST="gtest:" exits with error when it shouldn't
  • eb639a2: 8312585: Rename DisableTHPStackMitigation flag to THPStackMitigation
  • 804ce09: 8312620: WSL Linux build crashes after JDK-8310233
  • e0b39c7: 8312535: MidiSystem.getSoundbank() throws unexpected SecurityException
  • e6b87a7: 8312182: THPs cause huge RSS due to thread start timing issue
  • fbe3773: 8312394: [linux] SIGSEGV if kernel was built without hugepage support

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 5, 2023

@shipilev Pushed as commit 75e1441.

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

@shipilev shipilev mentioned this pull request Sep 12, 2023
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants