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

8220634: SymLinkArchiveTest should handle not being able to create symlinks #765

Conversation

cushon
Copy link
Contributor

@cushon cushon commented Jan 14, 2022

This is a backport of JDK-8220634: SymLinkArchiveTest should handle not being able to create symlinks

The original patch applied cleanly on top of the backport of JDK-8214026, this is a follow-up to #760

Testing: tier1 tests pass


Progress

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

Issue

  • JDK-8220634: SymLinkArchiveTest should handle not being able to create symlinks

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 765

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 14, 2022

👋 Welcome back cushon! A progress list of the required criteria for merging this PR into pr/760 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 ab3f5e3e1529c2a06dac876c24e751ef3712f5f1 8220634: SymLinkArchiveTest should handle not being able to create symlinks Jan 14, 2022
@openjdk
Copy link

openjdk bot commented Jan 14, 2022

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

@openjdk openjdk bot added backport clean rfr Pull request is ready for review labels Jan 14, 2022
@mlbridge
Copy link

mlbridge bot commented Jan 14, 2022

Webrevs

@cushon
Copy link
Contributor Author

cushon commented Jan 17, 2022

JDK-8220634 has been tagged jdk11u-fix-yes

@cushon
Copy link
Contributor Author

cushon commented Jan 17, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jan 17, 2022

@cushon This pull request has not yet been marked as ready for integration.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/760 to master January 17, 2022 20:42
@openjdk-notifier
Copy link

The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout cushon-backport-bddbbd85
git fetch https://git.openjdk.java.net/jdk11u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot removed the clean label Jan 17, 2022
Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

This patch is the same as the one for 8214026 (which I just sponsored), see a29949b.

@cushon
Copy link
Contributor Author

cushon commented Jan 17, 2022

This patch is the same as the one for 8214026 (which I just sponsored), see a29949b.

@phohensee there were two commits here, the first is the same as 8214026, the second is for 8220634 (which was a follow-up fix to improve the test). I wasn't sure what the preferred way to do two dependent backports was, there was some discussion in the other PR: #760 (comment)

I will rebase this on top of master now that the one for 8214026 has been accepted. Thanks for sponsoring it!

@cushon cushon force-pushed the cushon-backport-ab3f5e3e1529c2a06dac876c24e751ef3712f5f1 branch from d03a609 to 93ba443 Compare January 17, 2022 21:00
@cushon
Copy link
Contributor Author

cushon commented Jan 17, 2022

/integrate

@openjdk openjdk bot added the clean label Jan 17, 2022
@openjdk
Copy link

openjdk bot commented Jan 17, 2022

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

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

8220634: SymLinkArchiveTest should handle not being able to create symlinks

Reviewed-by: phh

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 (@phohensee) 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 ready Pull request is ready to be integrated sponsor Pull request is ready to be sponsored labels Jan 17, 2022
@openjdk
Copy link

openjdk bot commented Jan 17, 2022

@cushon
Your change (at version 93ba443) is now ready to be sponsored by a Committer.

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

Lgtm.

@RealCLanger
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Jan 17, 2022

Going to push as commit 5ab97c4.

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

openjdk bot commented Jan 17, 2022

@RealCLanger @cushon Pushed as commit 5ab97c4.

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