Navigation Menu

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

8278344: sun/security/pkcs12/KeytoolOpensslInteropTest.java test fails because of different openssl output #1343

Closed

Conversation

RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Aug 25, 2022

Backport does not apply cleanly which unveils a shortcoming of the fix
https://bugs.openjdk.org/browse/JDK-8267880
9cf9879

The test had been adapted at various places from sha1->sha256 but the two modified locations are still at sha1.

We see the test failing on a few systems which should be fixed herewith.

I will also backport the follow-up https://bugs.openjdk.org/browse/JDK-8279385


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-8278344: sun/security/pkcs12/KeytoolOpensslInteropTest.java test fails because of different openssl output

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1343

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 25, 2022

👋 Welcome back clanger! 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 8b5ff4bdffc8f32317d67b00c085071d6c772b30 8278344: sun/security/pkcs12/KeytoolOpensslInteropTest.java test fails because of different openssl output Aug 25, 2022
@openjdk
Copy link

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

mlbridge bot commented Aug 25, 2022

Webrevs

@openjdk-notifier
Copy link

@RealCLanger 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.

@RealCLanger
Copy link
Contributor Author

RealCLanger commented Aug 25, 2022

Copy link
Member

@MBaesken MBaesken left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@openjdk
Copy link

openjdk bot commented Aug 26, 2022

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

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

8278344: sun/security/pkcs12/KeytoolOpensslInteropTest.java test fails because of different openssl output

Reviewed-by: mbaesken

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:

  • cbbec73: 8230708: Hotspot fails to build on linux-sparc with gcc-9
  • 01db476: 8282947: JFR: Dump on shutdown live-locks in some conditions
  • 1d7b292: 8238586: [TESTBUG] vmTestbase/jit/tiered/Test.java failed when TieredCompilation is disabled

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.

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

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 26, 2022
@RealCLanger
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 26, 2022

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

  • 90a6418: 8287741: Fix of JDK-8287107 (unused cgv1 freezer controller) was incomplete
  • 1afd1f4: 8287073: NPE from CgroupV2Subsystem.getInstance()
  • 81c2958: 8287107: CgroupSubsystemFactory.setCgroupV2Path asserts with freezer controller
  • cbbec73: 8230708: Hotspot fails to build on linux-sparc with gcc-9
  • 01db476: 8282947: JFR: Dump on shutdown live-locks in some conditions
  • 1d7b292: 8238586: [TESTBUG] vmTestbase/jit/tiered/Test.java failed when TieredCompilation is disabled

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 26, 2022

@RealCLanger Pushed as commit 0cd49f5.

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

@RealCLanger RealCLanger deleted the RealCLanger-backport-8b5ff4bd branch August 26, 2022 09:02
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