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

8233986: ProblemList javax/swing/plaf/basic/BasicTextUI/8001470/bug8001470.java for windows-x64 #830

Closed
wants to merge 1 commit into from

Conversation

yukikimmura
Copy link
Contributor

@yukikimmura yukikimmura commented Feb 17, 2022

I would like to backport
JDK-8233986: ProblemList javax/swing/plaf/basic/BasicTextUI/8001470/bug8001470.java
JDK-8213181: Updation of ProblemList.txt for removal of passing swing test (dependency)

Original patches do not apply cleanly to 11u.

I resolved a conflict and applied only the relevant parts of JDK-8213181 related to bug8001470.java.
The purpose of these backports is to exclude javax/swing/plaf/basic/BasicTextUI/8001470/bug8001470.java on both Linux and Windows OS. The current ProblemList.txt has two lines containing the test and the first line is ignored.
As a result, the test runs on the Linux OS unexpectedly.

Testing:
tier1 on Windows x86_64 and Linux x86_64
Verify that javax/swing/plaf/basic/BasicTextUI/8001470/bug8001470.java does not run on Linux OS


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8233986: ProblemList javax/swing/plaf/basic/BasicTextUI/8001470/bug8001470.java for windows-x64 ⚠️ Issue is not open.

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/830/head:pull/830
$ git checkout pull/830

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 830

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/830.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 17, 2022

👋 Welcome back yukikimmura! 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.

@yukikimmura yukikimmura changed the title 8233986:ProblemList javax/swing/plaf/basic/BasicTextUI/8001470/bug8001470.java for windows-x64 8233986: ProblemList javax/swing/plaf/basic/BasicTextUI/8001470/bug8001470.java for windows-x64 Feb 17, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 17, 2022
@mlbridge
Copy link

mlbridge bot commented Feb 17, 2022

Webrevs

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm.

@openjdk
Copy link

openjdk bot commented Feb 17, 2022

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

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

8233986: ProblemList javax/swing/plaf/basic/BasicTextUI/8001470/bug8001470.java for windows-x64

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

  • 57003ee: 8274524: SSLSocket.close() hangs if it is called during the ssl handshake
  • e2f792c: 8255239: The timezone of the hs_err_pid log file is corrupted in Japanese locale
  • d6bf0d1: 8272541: Incorrect overflow test in Toom-Cook branch of BigInteger multiplication
  • b5f8c31: 8254072: AArch64: Get rid of --disable-warnings-as-errors on Windows+ARM64 build
  • 0aa5f75: 8262894: [macos_aarch64] SIGBUS in Assembler::ld_st2
  • 69583df: 8266889: [macosx-aarch64] Crash with SIGBUS in MarkActivationClosure::do_code_blob during vmTestbase/nsk/jvmti/.../bi04t002 test run
  • aa42c4d: 8241004: NMT tests fail on unaligned thread size with debug build
  • eb0708f: 8253795: Implementation of JEP 391: macOS/AArch64 Port
  • fe17b44: 8280414: Memory leak in DefaultProxySelector
  • fd7d0d3: 8280526: x86_32 Math.sqrt performance regression with -XX:UseSSE={0,1}
  • ... and 16 more: https://git.openjdk.java.net/jdk11u-dev/compare/01c38c4ffa1f408061caee9aed2e4e863d01207f...master

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 added the ready Pull request is ready to be integrated label Feb 17, 2022
@yukikimmura
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Feb 17, 2022
@openjdk
Copy link

openjdk bot commented Feb 17, 2022

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

@RealCLanger
Copy link
Contributor

/integrate

@yukikimmura you must not do /integrate before there's maintainer approval in the JBS issue, indicated by the "jdk11u-fix-yes" label. I have approved it now.

/sponsor

@openjdk
Copy link

openjdk bot commented Feb 18, 2022

Going to push as commit 259bbf5.
Since your change was applied there have been 26 commits pushed to the master branch:

  • 57003ee: 8274524: SSLSocket.close() hangs if it is called during the ssl handshake
  • e2f792c: 8255239: The timezone of the hs_err_pid log file is corrupted in Japanese locale
  • d6bf0d1: 8272541: Incorrect overflow test in Toom-Cook branch of BigInteger multiplication
  • b5f8c31: 8254072: AArch64: Get rid of --disable-warnings-as-errors on Windows+ARM64 build
  • 0aa5f75: 8262894: [macos_aarch64] SIGBUS in Assembler::ld_st2
  • 69583df: 8266889: [macosx-aarch64] Crash with SIGBUS in MarkActivationClosure::do_code_blob during vmTestbase/nsk/jvmti/.../bi04t002 test run
  • aa42c4d: 8241004: NMT tests fail on unaligned thread size with debug build
  • eb0708f: 8253795: Implementation of JEP 391: macOS/AArch64 Port
  • fe17b44: 8280414: Memory leak in DefaultProxySelector
  • fd7d0d3: 8280526: x86_32 Math.sqrt performance regression with -XX:UseSSE={0,1}
  • ... and 16 more: https://git.openjdk.java.net/jdk11u-dev/compare/01c38c4ffa1f408061caee9aed2e4e863d01207f...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 18, 2022
@openjdk openjdk bot closed this Feb 18, 2022
@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 Feb 18, 2022
@openjdk
Copy link

openjdk bot commented Feb 18, 2022

@RealCLanger @yukikimmura Pushed as commit 259bbf5.

💡 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
integrated Pull request has been integrated
3 participants