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

8319569: Several java/util tests should be updated to accept VM flags #129

Closed
wants to merge 7 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 4, 2024

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


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8319569 needs maintainer approval

Issue

  • JDK-8319569: Several java/util tests should be updated to accept VM flags (Sub-task - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 129

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 4, 2024

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into pr/106 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 2bb4b9398d65e3f37f34e45476c969ff0afb1540 8319569: Several java/util tests should be updated to accept VM flags Jan 4, 2024
@openjdk
Copy link

openjdk bot commented Jan 4, 2024

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 Jan 4, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 4, 2024

Webrevs

@GoeLin GoeLin changed the base branch from pr/106 to pr/105 January 4, 2024 18:16
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/105 to master January 8, 2024 07:07
@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_8319569
git fetch https://git.openjdk.org/jdk21u-dev.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 openjdk bot removed the clean label Jan 8, 2024
@openjdk
Copy link

openjdk bot commented Jan 8, 2024

@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_8319569
git fetch https://git.openjdk.org/jdk21u-dev.git 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 Jan 8, 2024
@openjdk openjdk bot added the clean label Jan 8, 2024
@openjdk
Copy link

openjdk bot commented Jan 8, 2024

⚠️ @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 8, 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:

8319569: Several java/util tests should be updated to accept VM flags

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 ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Jan 8, 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 854c319.

@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 854c319.

💡 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_8319569 branch January 8, 2024 07:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant