Skip to content

Conversation

@kurashige23
Copy link
Member

@kurashige23 kurashige23 commented Nov 26, 2024

Hi all,

This is a backport of JDK-8344275 : tools/jpackage/windows/Win8301247Test.java fails on localized Windows platform

Original patch does not apply cleanly because JDK-8340311 and JDK-8343314 are not applied to jdk21.
JDK-8340311 and JDK-8343314 are enhancement, so I don't backport them.

Testing: tools/jpackage tests importing jdk.jpackage.test.Executor on Windows Server 2019 (Japanese and English locales)

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

Issue

  • JDK-8344275: tools/jpackage/windows/Win8301247Test.java fails on localized Windows platform (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1182

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 26, 2024

👋 Welcome back kurashige23! 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 Nov 26, 2024

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

8344275: tools/jpackage/windows/Win8301247Test.java fails on localized Windows platform

Reviewed-by: asemenyuk, 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 67 new commits pushed to 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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@phohensee) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot changed the title Backport 48e3b6511adf3d4e97035014612674d84ae83aa0 8344275: tools/jpackage/windows/Win8301247Test.java fails on localized Windows platform Nov 26, 2024
@openjdk
Copy link

openjdk bot commented Nov 26, 2024

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 Nov 26, 2024
@mlbridge
Copy link

mlbridge bot commented Nov 26, 2024

Webrevs

@kurashige23
Copy link
Member Author

Could anyone review this backport please?

@openjdk
Copy link

openjdk bot commented Dec 9, 2024

⚠️ @kurashige23 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.

@kurashige23
Copy link
Member Author

/approval request Backporting this patch resolves tools/jpackage/windows/Win8301247Test.java failure.
Original patch does not apply cleanly because JDK-8340311 and JDK-8343314 are not applied to jdk21.
Test-only fix, low risk.
tools/jpackage tests importing jdk.jpackage.test.Executor on Windows Server 2019 (Japanese and English locales) pass.

@openjdk
Copy link

openjdk bot commented Dec 10, 2024

@kurashige23
8344275: The approval request has been created successfully.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Dec 10, 2024
@GoeLin
Copy link
Member

GoeLin commented Dec 12, 2024

Hi, I am currently backporting 8343314, will approve after pushing that.

@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 Dec 17, 2024
@kurashige23
Copy link
Member Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 18, 2024
@openjdk
Copy link

openjdk bot commented Dec 18, 2024

@kurashige23
Your change (at version b15a92b) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 18, 2024

Going to push as commit 227c430.
Since your change was applied there have been 71 commits pushed to the master branch:

  • 1c53e8c: 8328827: Convert java/awt/print/PrinterJob/PrinterDialogsModalityTest/PrinterDialogsModalityTest.html applet test to main
  • c0336dd: 8328717: Convert javax/swing/JColorChooser/8065098/bug8065098.java applet test to main
  • 0a65f3c: 8328370: Convert java/awt/print/Dialog/PrintApplet.java applet test to main
  • 57973b7: 8328185: Convert java/awt/image/MemoryLeakTest/MemoryLeakTest.java applet test to main
  • cce9336: 8316371: Open some swing tests 6
  • 0cdb868: 8316218: Open some swing tests 5
  • 0cb7705: 8316146: Open some swing tests 4
  • 85453b6: 8315882: Open some swing tests 2
  • e1b5f3c: 8343314: Move common properties from jpackage jtreg test declarations to TEST.properties file
  • 30eeb80: 8341978: Improve JButton/bug4490179.java
  • ... and 61 more: https://git.openjdk.org/jdk21u-dev/compare/50aa07ef1ee658424f016d06aeed7003bfba534d...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 18, 2024
@openjdk openjdk bot closed this Dec 18, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Dec 18, 2024
@openjdk
Copy link

openjdk bot commented Dec 18, 2024

@phohensee @kurashige23 Pushed as commit 227c430.

💡 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.

4 participants