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

8303972: (zipfs) Make test/jdk/jdk/nio/zipfs/TestLocOffsetFromZip64EF.java independent of the zip command line #2420

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Apr 19, 2024

I backport this for parity with 17.0.12-oracle.

I had to resolve because "8284191: Replace usages of 'a the' in hotspot and java.base" is not in 17.
Also, the test is not ProblemListed in 17.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • JDK-8303972 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8301183 needs maintainer approval

Issues

  • JDK-8303972: (zipfs) Make test/jdk/jdk/nio/zipfs/TestLocOffsetFromZip64EF.java independent of the zip command line (Enhancement - P4 - Approved)
  • JDK-8301183: (zipfs) jdk/jdk/nio/zipfs/TestLocOffsetFromZip64EF.java failing with ZipException:R0 on OL9 (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2420

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 19, 2024

👋 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
Copy link

openjdk bot commented Apr 19, 2024

@GoeLin 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:

8303972: (zipfs) Make test/jdk/jdk/nio/zipfs/TestLocOffsetFromZip64EF.java independent of the zip command line
8301183: (zipfs) jdk/jdk/nio/zipfs/TestLocOffsetFromZip64EF.java failing with ZipException:R0 on OL9

Reviewed-by: lucy

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

  • c741b35: 8281658: Add a security category to the java -XshowSettings option
  • 5b656c8: 8319048: Monitor deflation unlink phase prolongs time to safepoint

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 changed the title Backport 7004c2724d9b150112c66febb7f24b781ff379dd 8303972: (zipfs) Make test/jdk/jdk/nio/zipfs/TestLocOffsetFromZip64EF.java independent of the zip command line Apr 19, 2024
@openjdk
Copy link

openjdk bot commented Apr 19, 2024

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Apr 19, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 19, 2024

Webrevs

Copy link

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

@openjdk
Copy link

openjdk bot commented Apr 21, 2024

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Apr 21, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Apr 22, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Apr 22, 2024

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

  • e806430: 8322858: compiler/c2/aarch64/TestFarJump.java fails on AArch64 due to unexpected PrintAssembly output
  • c741b35: 8281658: Add a security category to the java -XshowSettings option
  • 5b656c8: 8319048: Monitor deflation unlink phase prolongs time to safepoint

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 22, 2024

@GoeLin Pushed as commit 776e10a.

💡 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_8303972 branch April 22, 2024 13:58
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
Development

Successfully merging this pull request may close these issues.

2 participants