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

8326661: sun/java2d/cmm/ColorConvertOp/ColConvTest.java assumes profiles were generated by LCMS #2331

Closed
wants to merge 1 commit into from

Conversation

luchenlin
Copy link

@luchenlin luchenlin commented Mar 26, 2024

I backport this for parity with 17.0.11-oracle.


Progress

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

Issue

  • JDK-8326661: sun/java2d/cmm/ColorConvertOp/ColConvTest.java assumes profiles were generated by LCMS (Bug - P3 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2331

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 26, 2024

👋 Welcome back andrewlu! 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 Mar 26, 2024

@luchenlin 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:

8326661: sun/java2d/cmm/ColorConvertOp/ColConvTest.java assumes profiles were generated by LCMS

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

  • f52725d: 8280056: gtest/LargePageGtests.java#use-large-pages failed "os.release_one_mapping_multi_commits_vm"
  • 91ac085: 8328825: Google CAInterop test failures
  • 533e1b1: 8328948: GHA: Restoring sysroot from cache skips the build after JDK-8326960
  • 791be77: 8328705: GHA: Cross-compilation jobs do not require build JDK
  • 432210b: 8280546: Remove hard-coded 127.0.0.1 loopback address
  • d74ef51: 8260540: serviceability/jdwp/AllModulesCommandTest.java failed with "Debuggee error: 'ERROR: transport error 202: bind failed: Address already in use'"
  • b4d22f6: 8326960: GHA: RISC-V sysroot cannot be debootstrapped due to ongoing Debian t64 transition
  • 56ed749: 8327059: os::Linux::print_proc_sys_info add swappiness information
  • 6700a49: 8312383: Log X509ExtendedKeyManager implementation class name in TLS/SSL connection
  • d554437: 8315663: Open source misc awt tests
  • ... and 15 more: https://git.openjdk.org/jdk17u-dev/compare/fce02ad5cb321bbcf63c8476cd28821b3e187e5b...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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot changed the title Backport 1f43fa0f8b0f956b41015e0ebc257e15a11ad99b 8326661: sun/java2d/cmm/ColorConvertOp/ColConvTest.java assumes profiles were generated by LCMS Mar 26, 2024
@openjdk
Copy link

openjdk bot commented Mar 26, 2024

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

@openjdk
Copy link

openjdk bot commented Mar 26, 2024

⚠️ @luchenlin 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 Mar 26, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 26, 2024

Webrevs

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Mar 28, 2024
@luchenlin
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 28, 2024

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

  • b293856: 8323994: gtest runner repeats test name for every single gtest assertion
  • f52725d: 8280056: gtest/LargePageGtests.java#use-large-pages failed "os.release_one_mapping_multi_commits_vm"
  • 91ac085: 8328825: Google CAInterop test failures
  • 533e1b1: 8328948: GHA: Restoring sysroot from cache skips the build after JDK-8326960
  • 791be77: 8328705: GHA: Cross-compilation jobs do not require build JDK
  • 432210b: 8280546: Remove hard-coded 127.0.0.1 loopback address
  • d74ef51: 8260540: serviceability/jdwp/AllModulesCommandTest.java failed with "Debuggee error: 'ERROR: transport error 202: bind failed: Address already in use'"
  • b4d22f6: 8326960: GHA: RISC-V sysroot cannot be debootstrapped due to ongoing Debian t64 transition
  • 56ed749: 8327059: os::Linux::print_proc_sys_info add swappiness information
  • 6700a49: 8312383: Log X509ExtendedKeyManager implementation class name in TLS/SSL connection
  • ... and 16 more: https://git.openjdk.org/jdk17u-dev/compare/fce02ad5cb321bbcf63c8476cd28821b3e187e5b...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 28, 2024

@luchenlin Pushed as commit f6c87d8.

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

Successfully merging this pull request may close these issues.

1 participant