Skip to content

Conversation

@amosshi
Copy link
Contributor

@amosshi amosshi commented Oct 3, 2023


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8252713 needs maintainer approval

Issue

  • JDK-8252713: jtreg time out of CtrlASCII.java seems to hang the Xserver. (Bug - P3 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2163

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 3, 2023

👋 Welcome back amosshi! 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 6d6046b3799217c281d077f12bce1ec590149849 8252713: jtreg time out of CtrlASCII.java seems to hang the Xserver. Oct 3, 2023
@openjdk
Copy link

openjdk bot commented Oct 3, 2023

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 clean Identical backport; no merge resolution required labels Oct 3, 2023
@openjdk
Copy link

openjdk bot commented Oct 3, 2023

⚠️ @amosshi 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 rfr Pull request is ready for review label Oct 3, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 3, 2023

Webrevs

@amosshi
Copy link
Contributor Author

amosshi commented Oct 10, 2023

/approval request "Backporting for parity with jdk11.0.21-oracle. No risk, test fix. Clean backport. Test passes and SAP nightlies pass.”

@openjdk
Copy link

openjdk bot commented Oct 10, 2023

@amosshi
8252713: The approval request has been created successfully.

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

GoeLin commented Oct 11, 2023

/approve yes

@openjdk
Copy link

openjdk bot commented Oct 11, 2023

@GoeLin
8252713: The approval request has been approved.

@openjdk
Copy link

openjdk bot commented Oct 11, 2023

⚠️ @amosshi the full name on your profile does not match the author name in this pull requests' HEAD commit. If this pull request gets integrated then the author name from this pull requests' HEAD commit will be used for the resulting commit. If you wish to push a new commit with a different author name, then please run the following commands in a local repository of your personal fork:

$ git checkout backport-8252713
$ git commit --author='Preferred Full Name <you@example.com>' --allow-empty -m 'Update full name'
$ git push

@openjdk
Copy link

openjdk bot commented Oct 11, 2023

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

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

8252713: jtreg time out of CtrlASCII.java seems to hang the Xserver.

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

  • 8336e3e: 8312573: Failure during CompileOnly parsing leads to ShouldNotReachHere
  • a75f34f: 8232933: Javac inferred type does not conform to equality constraint
  • b017f76: 8210168: JCK test .vm.classfmt.ins.code__002.code__00201m1.code__00201m1 hangs with -noverify
  • c4faab6: 8308592: Framework for CA interoperability testing
  • df5ff37: 8315683: Parallelize java/util/concurrent/tck/JSR166TestCase.java
  • 0aba9b7: 8316710: Exclude java/awt/font/Rotate/RotatedTextTest.java
  • 682bcf2: 8316514: Better diagnostic header for VtableStub
  • 059f73c: 8242330: Arrays should be cloned in several JAAS Callback classes
  • 96e3db7: 8315937: Enable parallelism in vmTestbase/nsk/stress/numeric tests
  • fb7e6e3: 8315766: Parallelize gc/stress/TestStressIHOPMultiThread.java test
  • ... and 2 more: https://git.openjdk.org/jdk11u-dev/compare/a4b30272bc08e3c799183604f0a606e5f526b9ca...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.

➡️ 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 ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Oct 11, 2023
@amosshi
Copy link
Contributor Author

amosshi commented Oct 11, 2023

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Oct 11, 2023
@openjdk
Copy link

openjdk bot commented Oct 11, 2023

@amosshi
Your change (at version 67106b3) is now ready to be sponsored by a Committer.

@GoeLin
Copy link
Member

GoeLin commented Oct 11, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Oct 11, 2023

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

  • 75b7c79: 8300405: Screen capture for test JFileChooserSetLocationTest.java, failure case
  • 6e34daa: 8282404: DrawStringWithInfiniteXform.java failed with "RuntimeException: drawString with InfiniteXform transform takes long time"
  • 2a39b98: 8197825: [Test] Intermittent timeout with javax/swing JColorChooser Test
  • 8336e3e: 8312573: Failure during CompileOnly parsing leads to ShouldNotReachHere
  • a75f34f: 8232933: Javac inferred type does not conform to equality constraint
  • b017f76: 8210168: JCK test .vm.classfmt.ins.code__002.code__00201m1.code__00201m1 hangs with -noverify
  • c4faab6: 8308592: Framework for CA interoperability testing
  • df5ff37: 8315683: Parallelize java/util/concurrent/tck/JSR166TestCase.java
  • 0aba9b7: 8316710: Exclude java/awt/font/Rotate/RotatedTextTest.java
  • 682bcf2: 8316514: Better diagnostic header for VtableStub
  • ... and 5 more: https://git.openjdk.org/jdk11u-dev/compare/a4b30272bc08e3c799183604f0a606e5f526b9ca...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 11, 2023

@GoeLin @amosshi Pushed as commit 4780287.

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

@amosshi amosshi deleted the backport-8252713 branch October 12, 2023 20:12
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 clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants