Skip to content

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Apr 20, 2023

I backport this for parity with 11.0.20-oracle.

I resolved the imports in PKCS11TEst.java. Some were already there, the other could not be deleted.


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-8209546: Make sun/security/tools/keytool/autotest.sh to support macosx

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1839

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 20, 2023

👋 Welcome back goetz! 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 afe05800acd115aa707ddd3b08d5b8a79810df20 8209546: Make sun/security/tools/keytool/autotest.sh to support macosx Apr 20, 2023
@openjdk
Copy link

openjdk bot commented Apr 20, 2023

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Apr 20, 2023
@GoeLin GoeLin force-pushed the goetz_backport_8209546 branch from 89a95b4 to 29703d0 Compare April 20, 2023 07:33
@mlbridge
Copy link

mlbridge bot commented Apr 20, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Apr 20, 2023

@GoeLin Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@GoeLin
Copy link
Member Author

GoeLin commented Apr 24, 2023

Pre-submit failure: Run Visual Studio Installer
Error: Process completed with exit code 1.
Unrelated.

Copy link
Member

@reinrich reinrich 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 Apr 24, 2023

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

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

8209546: Make sun/security/tools/keytool/autotest.sh to support macosx

Refactor autotest.sh to java test and remove standard.sh

Reviewed-by: rrich

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 21 new commits pushed to 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 Apr 24, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Apr 25, 2023

Thanks for all the reviews!

@GoeLin
Copy link
Member Author

GoeLin commented Apr 25, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Apr 25, 2023

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 25, 2023

@GoeLin Pushed as commit b368809.

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

@GoeLin GoeLin deleted the goetz_backport_8209546 branch April 25, 2023 12:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants