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

8298413: [s390] CPUInfoTest fails due to uppercase feature string #2449

Conversation

offamitkumar
Copy link
Member

@offamitkumar offamitkumar commented May 7, 2024

Hi all,

This pull request contains a backport of commit 9dad874f from the openjdk/jdk repository.

The commit being backported was authored by Amit Kumar on 7 Feb 2023 and was reviewed by Martin Doerr and Lutz Schmidt.

Thanks!


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
  • JDK-8298413 needs maintainer approval

Issue

  • JDK-8298413: [s390] CPUInfoTest fails due to uppercase feature string (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2449

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 7, 2024

👋 Welcome back amitkumar! 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
Copy link

openjdk bot commented May 7, 2024

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8298413: [s390] CPUInfoTest fails due to uppercase feature string

Reviewed-by: lucy

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

  • d2982c6: 8331641: [17u]: Bump GHA bootstrap JDK to 17.0.11
  • 68a2d93: 8330094: RISC-V: Save and restore FRM in the call stub
  • 32bf1f4: 8325579: Inconsistent behavior in com.sun.jndi.ldap.Connection::createSocket

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.

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 (@RealLucy) 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 changed the title Backport 9dad874ff9f03f5891aa8b37e7826a67c851f06d 8298413: [s390] CPUInfoTest fails due to uppercase feature string May 7, 2024
@openjdk
Copy link

openjdk bot commented May 7, 2024

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 May 7, 2024
@mlbridge
Copy link

mlbridge bot commented May 7, 2024

Webrevs

@offamitkumar
Copy link
Member Author

I have done testing on s390x and test is passing on JDK17u-dev without any issue. I guess if I backport openjdk/jdk#8142 then it could be clean. But I'm not sure.

@RealLucy would you please review this one and look if I should backport the PR I mentioned above ?

Copy link

@RealLucy RealLucy 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 May 7, 2024

⚠️ @offamitkumar 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.

@RealLucy
Copy link

RealLucy commented May 7, 2024

I guess if I backport openjdk/jdk#8142 then it could be clean. But I'm not sure.

You should never consider backporting such a huge, and unrelated, change just to achieve cleanliness of such a trivial backport. The effort you have to invest is way higher than the benefit you get.

@offamitkumar
Copy link
Member Author

You should never consider backporting such a huge, and unrelated, change just to achieve cleanliness of such a trivial backport. The effort you have to invest is way higher than the benefit you get.

Sure. Thank you.

@offamitkumar
Copy link
Member Author

/approval request Test is failing on JDK17 as well. So need to backport the fix. I have done testing and no regression seen. The change is s390x specific so should be fine with other archs as well.

@openjdk
Copy link

openjdk bot commented May 7, 2024

@offamitkumar
8298413: The approval request has been created successfully.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels May 7, 2024
@offamitkumar
Copy link
Member Author

Thanks Lutz for review.

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label May 8, 2024
@openjdk
Copy link

openjdk bot commented May 8, 2024

@offamitkumar
Your change (at version 6276d5f) is now ready to be sponsored by a Committer.

@RealLucy
Copy link

RealLucy commented May 8, 2024

/sponsor

@openjdk
Copy link

openjdk bot commented May 8, 2024

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

  • d2982c6: 8331641: [17u]: Bump GHA bootstrap JDK to 17.0.11
  • 68a2d93: 8330094: RISC-V: Save and restore FRM in the call stub
  • 32bf1f4: 8325579: Inconsistent behavior in com.sun.jndi.ldap.Connection::createSocket

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 8, 2024

@RealLucy @offamitkumar Pushed as commit e974897.

💡 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
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants