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

8268776: Test ADatagramSocket.java missing /othervm from @run tag #226

Closed
wants to merge 1 commit into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Aug 11, 2021

Clean backport to match 11.0.13-oracle.

Additional testing:

  • Affected test still passes

Progress

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

Issue

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 226

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 11, 2021

👋 Welcome back shade! 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 7d7bdbe135018f1452fa133b294575014e3e871b 8268776: Test ADatagramSocket.java missing /othervm from @run tag Aug 11, 2021
@openjdk
Copy link

openjdk bot commented Aug 11, 2021

This backport pull request has now been updated with issue from the original commit.

@openjdk
Copy link

openjdk bot commented Aug 11, 2021

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

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

8268776: Test `ADatagramSocket.java` missing /othervm from @run tag

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 rfr Pull request is ready for review labels Aug 11, 2021
@mlbridge
Copy link

mlbridge bot commented Aug 11, 2021

Webrevs

@shipilev
Copy link
Member Author

Got the push approval.

/integrate

@openjdk
Copy link

openjdk bot commented Aug 13, 2021

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

  • 7b6f391: 8242882: opening jar file with large manifest might throw NegativeArraySizeException
  • dffc5f4: 8211092: test/jdk/sun/net/www/http/HttpClient/MultiThreadTest.java fails intermittently when cleaning up
  • 236a469: 8214937: sun/security/tools/jarsigner/warnings/NoTimestampTest.java failed due to unexpected expiration date
  • 868921f: 8235216: typo in test filename
  • 177d177: 8246261: TCKLocalTime.java failed due to "AssertionError: expected [18:14:22] but found [18:14:23]"
  • 93b826b: 8213235: java/nio/channels/SocketChannel/AsyncCloseChannel.java fails with threads that didn't exit
  • ec71e34: 8216532: tools/launcher/Test7029048.java fails (Solaris)
  • 8434e33: 8210934: Move sun/net/www/protocol/http/GetErrorStream.java to OpenJDK
  • 270786f: 8210669: Some launcher tests assume a pre-JDK 9 run-time image layout
  • 8e63ecb: 8258703: Incorrect 512-bit vector registers restore on x86_32
  • ... and 10 more: https://git.openjdk.java.net/jdk11u-dev/compare/5f9429b58f68a2d71b3dae96e15353b780c745a3...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Aug 13, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 13, 2021
@openjdk
Copy link

openjdk bot commented Aug 13, 2021

@shipilev Pushed as commit 51cd685.

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

@shipilev shipilev deleted the JDK-8268776 branch August 13, 2021 10:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

1 participant