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

8272581: sun/security/pkcs11/Provider/MultipleLogins.sh fails after JDK-8266182 #400

Closed
wants to merge 1 commit into from

Conversation

jmtd
Copy link

@jmtd jmtd commented Sep 23, 2021

Please consider this backport for jdk11u. It depends upon JDK-8266182 (#376) which in turn depends on JDK-8180571 (#396).

MultipleLogins.sh compiles all files under lib/jdk/test/lib/artifacts, Since JDK-8266182 added a new file OpensslArtifactFetcher.java which requires libraries outside of MultipleLogin.sh's classpath, it fails to build it.
The patch move and renames OpensslArtifactFetcher to resolve this.

The patch applies cleanly and MultipleLogins.sh passes after applying. Note that in my testing, in 11u, the test does not fail prior to applying: although it's clear from the output that it failed to build OpensslArtifactFetcher.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8272581: sun/security/pkcs11/Provider/MultipleLogins.sh fails after JDK-8266182

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/400/head:pull/400
$ git checkout pull/400

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 400

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/400.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 23, 2021

👋 Welcome back jdowland! 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 a199ebc0175f9882f051551cff9ce08016f204a4 8272581: sun/security/pkcs11/Provider/MultipleLogins.sh fails after JDK-8266182 Sep 23, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 23, 2021

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

@openjdk openjdk bot added backport rfr labels Sep 23, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 23, 2021

Webrevs

@TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Sep 23, 2021

Seems like this is not a proper "dependent PR". I'd select the old PR as diff target when creating the new PR.
But I think it is also ok if you just rebase this one once the other one is integrated.

@jmtd
Copy link
Author

@jmtd jmtd commented Oct 4, 2021

@TheRealMDoerr wrote:

Seems like this is not a proper "dependent PR". I'd select the old PR as diff target when creating the new PR.

Yes I think you're right, I didn't pick that up from the Skara mail I read, but it stands to reason.

But I think it is also ok if you just rebase this one once the other one is integrated.

I've done that now.

@openjdk
Copy link

@openjdk openjdk bot commented Oct 5, 2021

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

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

8272581: sun/security/pkcs11/Provider/MultipleLogins.sh fails after JDK-8266182

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

  • b1bab7f: 8272570: C2: crash in PhaseCFG::global_code_motion
  • 58fe5e8: 8273924: ArrayIndexOutOfBoundsException thrown in java.util.JapaneseImperialCalendar.add()
  • 881ae69: 8274326: [macos] Ensure initialisation of sun/lwawt/macosx/CAccessibility in JavaComponentAccessibility.m
  • 7f5569c: 8254802: ThrowingPushPromisesAsStringCustom.java fails in "try throwing in GET_BODY"
  • 620726e: 8262438: sun/security/ssl/SSLLogger/LoggingFormatConsistency.java failed with "SocketException: Socket is closed"
  • 76511ca: 8159904: [TEST_BUG] Failure on solaris of java/awt/Window/MultiWindowApp/MultiWindowAppTest.java
  • f248ceb: 8265173: [test] divert spurious log output away from stream under test in ProcessBuilder Basic test
  • f5e2a9d: 8263897: compiler/c2/aarch64/TestVolatilesSerial.java failed with "java.lang.RuntimeException: Wrong method"
  • 89aec26: 8075909: [TEST_BUG] The regression-swing case failed as it does not have the 'Open' button when select 'subdir' folder with NimbusLAF
  • 456d4fb: 8159597: [TEST_BUG] closed/javax/swing/JPopupMenu/4760494/bug4760494.java leaves key pressed
  • ... and 15 more: https://git.openjdk.java.net/jdk11u-dev/compare/f12af7e06c128b2771c4a5e9d83f0947755e4db6...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 label Oct 5, 2021
@jmtd
Copy link
Author

@jmtd jmtd commented Oct 7, 2021

/integrate

@openjdk openjdk bot added the sponsor label Oct 7, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 7, 2021

@jmtd
Your change (at version a3b1fd0) is now ready to be sponsored by a Committer.

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Oct 7, 2021

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Oct 7, 2021

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

  • b1bab7f: 8272570: C2: crash in PhaseCFG::global_code_motion
  • 58fe5e8: 8273924: ArrayIndexOutOfBoundsException thrown in java.util.JapaneseImperialCalendar.add()
  • 881ae69: 8274326: [macos] Ensure initialisation of sun/lwawt/macosx/CAccessibility in JavaComponentAccessibility.m
  • 7f5569c: 8254802: ThrowingPushPromisesAsStringCustom.java fails in "try throwing in GET_BODY"
  • 620726e: 8262438: sun/security/ssl/SSLLogger/LoggingFormatConsistency.java failed with "SocketException: Socket is closed"
  • 76511ca: 8159904: [TEST_BUG] Failure on solaris of java/awt/Window/MultiWindowApp/MultiWindowAppTest.java
  • f248ceb: 8265173: [test] divert spurious log output away from stream under test in ProcessBuilder Basic test
  • f5e2a9d: 8263897: compiler/c2/aarch64/TestVolatilesSerial.java failed with "java.lang.RuntimeException: Wrong method"
  • 89aec26: 8075909: [TEST_BUG] The regression-swing case failed as it does not have the 'Open' button when select 'subdir' folder with NimbusLAF
  • 456d4fb: 8159597: [TEST_BUG] closed/javax/swing/JPopupMenu/4760494/bug4760494.java leaves key pressed
  • ... and 15 more: https://git.openjdk.java.net/jdk11u-dev/compare/f12af7e06c128b2771c4a5e9d83f0947755e4db6...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 7, 2021
@openjdk openjdk bot added integrated and removed ready rfr sponsor labels Oct 7, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 7, 2021

@RealCLanger @jmtd Pushed as commit cbdb8c2.

💡 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
3 participants