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

8291794: [11u] Corrections after backport of JDK-8212028 #1302

Closed
wants to merge 1 commit into from

Conversation

gdams
Copy link
Member

@gdams gdams commented Aug 2, 2022

This change allows me to merge openjdk/jdk@753c58b cleanly


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

Issue

  • JDK-8291794: [11u] Corrections after backport of JDK-8212028

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1302

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 2, 2022

👋 Welcome back gdams! 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 03a8cdece5e1dabcae0cd4f7ce9c0165daa1e476 8211727: Adjust default concurrency settings for running tests on Sparc Aug 2, 2022
@openjdk
Copy link

openjdk bot commented Aug 2, 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 Aug 2, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 2, 2022

Webrevs

@RealCLanger
Copy link
Contributor

RealCLanger commented Aug 3, 2022

I've reviewed this one now and it gave me a little headache. I initially thought: That's weird, JDK-8211727 was already backported in 11.0.5 and there's also a commit for it. But looking deeper this unveiled a problem with my later backport of JDK-8212028 in 11.0.6: abcacae.
This introduced section "Setup global test running parameters" in RunTests.gmk again with the old code. That's the part you would be patching now.

So' it's good to fix this. But I would suggest that you create a new JBS issue named "[11u] Repair backport of JDK-8211727". For that, you can use this change and then please remove the duplicate section "Setup global test running parameters" in RunTests.gmk in line 35ff.

It's also good to fix ContinuousCallSiteTargetChange.java.

Thanks for your efforts!

@gdams gdams changed the title 8211727: Adjust default concurrency settings for running tests on Sparc 8291794: [11u] Repair backport of JDK-8211727 Aug 3, 2022
@gdams
Copy link
Member Author

gdams commented Aug 3, 2022

/label remove backport

@openjdk
Copy link

openjdk bot commented Aug 3, 2022

@gdams
The label backport is not a valid label.
These labels are valid:

@openjdk-notifier
Copy link

@gdams Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

@gdams gdams changed the title 8291794: [11u] Repair backport of JDK-8211727 8291794: [11u] Corrections after backport of JDK-8212028 Aug 3, 2022
Copy link
Contributor

@RealCLanger RealCLanger left a comment

Choose a reason for hiding this comment

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

This looks good to me. SAP nightlies passed.

@openjdk
Copy link

openjdk bot commented Aug 4, 2022

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

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

8291794: [11u] Corrections after backport of JDK-8212028

Reviewed-by: clanger

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

  • 4046ee2: 8221907: make reconfigure breaks when configured with relative paths
  • 39ec436: 8288928: Incorrect GPL header in pnglibconf.h (backport of JDK-8185041)
  • 0106d84: 8285693: Create an automated test for JDK-4702199
  • 9180dcb: 8284077: Create an automated test for JDK-4170173
  • ce8367f: 8288781: C1: LIR_OpVisitState::maxNumberOfOperands too small
  • 1c96cac: 8289471: Issue in Initialization of keys in ErrorMsg.java and XPATHErrorResources.java
  • ac89673: 8290000: Bump macOS GitHub actions to macOS 11
  • d647021: 8283624: Create an automated regression test for RFE-4390885
  • 9796aac: 8223543: [TESTBUG] Regression test java/awt/Graphics2D/DrawString/LCDTextSrcEa.java has issues
  • 3210c99: 8283245: Create a test for JDK-4670319
  • ... and 4 more: https://git.openjdk.org/jdk11u-dev/compare/e80c7e1868982a70fffa83954ca8081256009b90...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 (@RealCLanger) 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 Aug 4, 2022
@gdams
Copy link
Member Author

gdams commented Aug 4, 2022

/integrate

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

openjdk bot commented Aug 4, 2022

@gdams
Your change (at version 91b6da4) is now ready to be sponsored by a Committer.

@RealCLanger
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 4, 2022

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

  • 4046ee2: 8221907: make reconfigure breaks when configured with relative paths
  • 39ec436: 8288928: Incorrect GPL header in pnglibconf.h (backport of JDK-8185041)
  • 0106d84: 8285693: Create an automated test for JDK-4702199
  • 9180dcb: 8284077: Create an automated test for JDK-4170173
  • ce8367f: 8288781: C1: LIR_OpVisitState::maxNumberOfOperands too small
  • 1c96cac: 8289471: Issue in Initialization of keys in ErrorMsg.java and XPATHErrorResources.java
  • ac89673: 8290000: Bump macOS GitHub actions to macOS 11
  • d647021: 8283624: Create an automated regression test for RFE-4390885
  • 9796aac: 8223543: [TESTBUG] Regression test java/awt/Graphics2D/DrawString/LCDTextSrcEa.java has issues
  • 3210c99: 8283245: Create a test for JDK-4670319
  • ... and 4 more: https://git.openjdk.org/jdk11u-dev/compare/e80c7e1868982a70fffa83954ca8081256009b90...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 4, 2022

@RealCLanger @gdams Pushed as commit 761e568.

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

@gdams gdams deleted the sparc branch August 4, 2022 07:23
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