Skip to content

8314495: Update to use jtreg 7.3.1#123

Closed
shipilev wants to merge 1 commit intoopenjdk:masterfrom
shipilev:JDK-8314495-jtreg-7.3.1
Closed

8314495: Update to use jtreg 7.3.1#123
shipilev wants to merge 1 commit intoopenjdk:masterfrom
shipilev:JDK-8314495-jtreg-7.3.1

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented Sep 1, 2023

Unclean backport to bring jtreg version in alignment with mainline. The uncleanliness comes from contextual difference re gtest version in the adjacent hunks.

Additional testing:

  • GHA

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/jdk21u.git pull/123/head:pull/123
$ git checkout pull/123

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 123

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 1, 2023

👋 Welcome back shade! A progress list of the required criteria for merging this PR into pr/122 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 Sep 1, 2023
@openjdk
Copy link

openjdk bot commented Sep 1, 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 Sep 1, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 1, 2023

Webrevs

@shipilev shipilev force-pushed the JDK-8314495-jtreg-7.3.1 branch from 7513dbd to e44fcd1 Compare September 5, 2023 14:23
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/122 to master September 5, 2023 14:24
@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 JDK-8314495-jtreg-7.3.1
git fetch https://git.openjdk.org/jdk21u.git 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 Sep 5, 2023

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

@openjdk
Copy link

openjdk bot commented Sep 5, 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: phh

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Sep 5, 2023
@shipilev
Copy link
Member Author

shipilev commented Sep 5, 2023

Previous GHA was green. Current GHA had a least one test suite completed. Push approval granted.

/integrate

@openjdk
Copy link

openjdk bot commented Sep 5, 2023

Going to push as commit 6e54e82.
Since your change was applied there has been 1 commit pushed to the master branch:

  • b207ce7: 8315383: jlink SystemModulesPlugin incorrectly parses the options

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 6e54e82.

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

@shipilev shipilev deleted the JDK-8314495-jtreg-7.3.1 branch September 11, 2023 09:18
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.

2 participants

Comments