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

8210039: move OSInfo to top level testlibrary #876

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 10, 2022

I want to backport this test cleanup as it simplifies later backports.

Stuff to resolve was all trivial.

Already fixed:
patching file test/jdk/java/awt/Choice/PopupPosTest/PopupPosTest.java
patching file test/jdk/java/awt/FileDialog/8003399/bug8003399.java

Resolved because html test was already removed
test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemonicKeyTypedTest.java
test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.java
test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java
test/jdk/java/awt/List/KeyEventsTest/KeyEventsTest.java
test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java

Context
test/jdk/javax/swing/JButton/4796987/bug4796987.java

Copyright
patching file test/jdk/javax/swing/JFileChooser/8041694/bug8041694.java
patching file test/jdk/javax/swing/JPopupMenu/7154841/bug7154841.java

Indentation
patching file test/jdk/javax/swing/JLabel/6596966/bug6596966.java
patching file test/jdk/javax/swing/JMenu/6470128/bug6470128.java
patching file test/jdk/javax/swing/JPopupMenu/6827786/bug6827786.java
patching file test/jdk/javax/swing/JScrollBar/bug4202954/bug4202954.java
patching file test/jdk/javax/swing/JTabbedPane/4624207/bug4624207.java

Dependency of platform removed by backport of later change.
patching file test/jdk/sun/awt/dnd/8024061/bug8024061.java


Progress

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

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 876

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 10, 2022

👋 Welcome back goetz! 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 315e71f87e7441fff8a5b95335b7c8125e383766 8210039: move OSInfo to top level testlibrary Mar 10, 2022
@openjdk
Copy link

openjdk bot commented Mar 10, 2022

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 Mar 10, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 10, 2022

Webrevs

@GoeLin GoeLin force-pushed the goetz_backport_8210039 branch from 5828a08 to c004c54 Compare Mar 10, 2022
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

LGTM. Thanks for backporting.

@openjdk
Copy link

openjdk bot commented Mar 11, 2022

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

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

8210039: move OSInfo to top level testlibrary

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 1 new commit pushed to the master branch:

  • 51b45e7: 8282589: runtime/ErrorHandling/ErrorHandler.java fails on MacOS aarch64 in jdk 11

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 the ready Pull request is ready to be integrated label Mar 11, 2022
@openjdk openjdk bot mentioned this pull request Mar 11, 2022
3 tasks
@GoeLin
Copy link
Member Author

GoeLin commented Mar 14, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Mar 14, 2022

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

  • 5f40afc: 8223363: Bad node estimate assertion failure
  • 1123120: 8279668: x86: AVX2 versions of vpxor should be asserted
  • 39974dc: 8186548: move jdk.testlibrary.JcmdBase closer to tests
  • 50ac138: 8210022: remove jdk.testlibrary.ProcessThread, TestThread and XRun
  • 9d3c940: 8218751: Do not store original classfiles inside the CDS archive
  • 51b45e7: 8282589: runtime/ErrorHandling/ErrorHandler.java fails on MacOS aarch64 in jdk 11

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 14, 2022
@openjdk openjdk bot closed this Mar 14, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 14, 2022
@openjdk
Copy link

openjdk bot commented Mar 14, 2022

@GoeLin Pushed as commit c94ce2c.

💡 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_8210039 branch Mar 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants