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 #2620

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

sendaoYan
Copy link
Member

@sendaoYan sendaoYan commented Jun 21, 2024

Hi all,

This pull request contains a backport of commit 2bb4b939 from the openjdk/jdk repository.

The commit being backported was authored by Justin Lu on 23 Nov 2023 and was reviewed by Naoto Sato and Lance Andersen.

There are two files make this backport not clean:

  1. jdk17u-dev doesn't have file test/jdk/java/util/Currency/PropertiesTest.sh
  2. test/jdk/java/util/TimeZone/CustomTzIDCheckDST.java has previous change before the backport PR in jdk-tip

Additional testing

  • change verify

Thanks!


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-8319569 needs maintainer approval

Issue

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

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2620

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 21, 2024

👋 Welcome back syan! 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 Jun 21, 2024

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk openjdk bot changed the title Backport 2bb4b9398d65e3f37f34e45476c969ff0afb1540 8319569: Several java/util tests should be updated to accept VM flags Jun 21, 2024
@openjdk
Copy link

openjdk bot commented Jun 21, 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 Jun 21, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 21, 2024

Webrevs

@sendaoYan
Copy link
Member Author

depends JDK-8315097

@sendaoYan sendaoYan marked this pull request as draft June 21, 2024 01:23
@openjdk openjdk bot removed the rfr Pull request is ready for review label Jun 21, 2024
@openjdk
Copy link

openjdk bot commented Aug 15, 2024

@sendaoYan 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 jbs8319569
git fetch https://git.openjdk.org/jdk17u-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 Aug 15, 2024
@bridgekeeper
Copy link

bridgekeeper bot commented Oct 10, 2024

@sendaoYan This pull request has been inactive for more than 8 weeks and will be automatically closed if another 8 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@sendaoYan
Copy link
Member Author

wait.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport merge-conflict Pull request has merge conflict with target branch
Development

Successfully merging this pull request may close these issues.

1 participant