-
Notifications
You must be signed in to change notification settings - Fork 218
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
8298271: java/security/SignedJar/spi-calendar-provider/TestSPISigned.java failing on Windows #978
Conversation
👋 Welcome back sgehwolf! A progress list of the required criteria for merging this PR into |
This backport pull request has now been updated with issue from the original commit. |
The parent pull request that this pull request depends on 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 jdk-8298271-backport
git fetch https://git.openjdk.org/jdk17u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push |
…java failing on Windows
4fc63ee
to
b436c16
Compare
@RealCLanger @GoeLin Could you please help review this trivial fix? Just omits the problem list change from head and fixes a windows test fail seen after #977. |
@jerboaa 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. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lgtm.
@jerboaa 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:
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 6 new commits pushed to the
Please see this link for an up-to-date comparison between the source branch of this pull request and the ➡️ To integrate this PR with the above commit message to the |
Thanks, folks! |
/integrate |
Going to push as commit c370dec.
Your commit was automatically rebased without conflicts. |
Not clean backport, because the problem list bug JDK-8298274 won't get backported. Omitted the ProblemList.txt hunk. Instead I propose to backport the fix (this PR) instead. Follow up for #977
Please review this test-only backport. Thanks!
Test passes with the fix of openjdk/jdk17u#363 included.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev pull/978/head:pull/978
$ git checkout pull/978
Update a local copy of the PR:
$ git checkout pull/978
$ git pull https://git.openjdk.org/jdk17u-dev pull/978/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 978
View PR using the GUI difftool:
$ git pr show -t 978
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/978.diff