Skip to content

Conversation

@luchenlin
Copy link
Contributor

@luchenlin luchenlin commented Jan 4, 2024

I backport this for parity with 11.0.23-oracle.
Also backport for JDK-8237222, both clean.


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

Issues

  • JDK-8239801: [macos] java/awt/Focus/UnaccessibleChoice/AccessibleChoiceTest.java fails (Bug - P4 - Approved)
  • JDK-8237222: [macos] java/awt/Focus/UnaccessibleChoice/AccessibleChoiceTest.java fails (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2432

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 4, 2024

👋 Welcome back andrewlu! 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 b6dddf4ce6072416e17cadefbd8280f959fd93ca 8239801: [macos] java/awt/Focus/UnaccessibleChoice/AccessibleChoiceTest.java fails 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 the backport Port of a pull request already in a different code base label Jan 4, 2024
@luchenlin
Copy link
Contributor Author

/issue add JDK-8237222

@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 4, 2024
@openjdk
Copy link

openjdk bot commented Jan 4, 2024

@luchenlin
Adding additional issue to issue list: 8237222: [macos] java/awt/Focus/UnaccessibleChoice/AccessibleChoiceTest.java fails.

@mlbridge
Copy link

mlbridge bot commented Jan 4, 2024

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.

Looks correct. You could make reviewing easier by using separate commits when putting more than one backport into one PR in the future.

@openjdk
Copy link

openjdk bot commented Jan 5, 2024

⚠️ @luchenlin 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 openjdk bot added the approval Requires approval; will be removed when approval is received label Jan 8, 2024
@openjdk
Copy link

openjdk bot commented Jan 8, 2024

@luchenlin This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8239801: [macos] java/awt/Focus/UnaccessibleChoice/AccessibleChoiceTest.java fails
8237222: [macos] java/awt/Focus/UnaccessibleChoice/AccessibleChoiceTest.java fails

Reviewed-by: mdoerr

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

  • 9a16bee: 8310551: vmTestbase/nsk/jdb/interrupt/interrupt001/interrupt001.java timed out due to missing prompt
  • ed37e2d: 8208243: vmTestbase/gc/lock/jni/jnilock002/TestDescription.java fails in jdk/hs nightly
  • e3b6c50: 8311585: Add JRadioButtonMenuItem to bug8031573.java
  • 78ca5ec: 8202931: [macos] java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java fails
  • 888837a: 8315042: NPE in PKCS7.parseOldSignedData

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 ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Jan 8, 2024
@luchenlin
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 8, 2024

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

  • 9a16bee: 8310551: vmTestbase/nsk/jdb/interrupt/interrupt001/interrupt001.java timed out due to missing prompt
  • ed37e2d: 8208243: vmTestbase/gc/lock/jni/jnilock002/TestDescription.java fails in jdk/hs nightly
  • e3b6c50: 8311585: Add JRadioButtonMenuItem to bug8031573.java
  • 78ca5ec: 8202931: [macos] java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java fails
  • 888837a: 8315042: NPE in PKCS7.parseOldSignedData

Your commit was automatically rebased without conflicts.

@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

@luchenlin Pushed as commit 4031a88.

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

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