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

8240226: DeflateIn_InflateOut.java test incorrectly assumes size of compressed file #2719

Closed
wants to merge 1 commit into from

Conversation

vieiro
Copy link
Contributor

@vieiro vieiro commented May 21, 2024

A backport of https://bugs.openjdk.org/browse/JDK-8240226

JDK-8240226 contains a small fix to DeflateIn_InflateOut.java that makes the test pass when --with-zlib=system and the system zlib library is zlib-cloudflare.

This fix is also required for the test to pass in Fedora 40 with the (system wide default) ZLib-ng library.

Tested with both DEBUG and RELEASE builds in Fedora 40.

Let me know if updating the copyright year is required.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8240226 needs maintainer approval

Issue

  • JDK-8240226: DeflateIn_InflateOut.java test incorrectly assumes size of compressed file (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2719

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper bridgekeeper bot added the oca Needs verification of OCA signatory status label May 21, 2024
@bridgekeeper
Copy link

bridgekeeper bot commented May 21, 2024

Hi @vieiro, welcome to this OpenJDK project and thanks for contributing!

We do not recognize you as Contributor and need to ensure you have signed the Oracle Contributor Agreement (OCA). If you have not signed the OCA, please follow the instructions. Please fill in your GitHub username in the "Username" field of the application. Once you have signed the OCA, please let us know by writing /signed in a comment in this pull request.

If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user vieiro" as summary for the issue.

If you are contributing this work on behalf of your employer and your employer has signed the OCA, please let us know by writing /covered in a comment in this pull request.

@openjdk
Copy link

openjdk bot commented May 21, 2024

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

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

8240226: DeflateIn_InflateOut.java test incorrectly assumes size of compressed file

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

  • 4556aa9: 8317288: [macos] java/awt/Window/Grab/GrabTest.java: Press on the outside area didn't cause ungrab
  • 7b377ac: 8329013: StackOverflowError when starting Apache Tomcat with signed jar
  • 31a780d: 8276819: javax/print/PrintServiceLookup/FlushCustomClassLoader.java fails to free
  • c35d30d: 8331263: Bump update version for OpenJDK: jdk-11.0.25
  • 47fd86c: 8273153: Consolidate file_exists into os:file_exists
  • 8a489e5: 8293887: AArch64 build failure with GCC 12 due to maybe-uninitialized warning in libfdlibm k_rem_pio2.c
  • 3533374: 8312194: test/hotspot/jtreg/applications/ctw/modules/jdk_crypto_ec.java cannot handle empty modules
  • b7596f3: 8316138: Add GlobalSign 2 TLS root certificates
  • b8ee2aa: 8326591: New test JmodExcludedFiles.java fails on Windows when --with-external-symbols-in-bundles=public is used

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ 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 changed the title Backport b38f3cf3bdde596c07c00106e8a60263ee6cb374 8240226: DeflateIn_InflateOut.java test incorrectly assumes size of compressed file May 21, 2024
@openjdk
Copy link

openjdk bot commented May 21, 2024

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

@openjdk openjdk bot added the backport label May 21, 2024
@vieiro
Copy link
Contributor Author

vieiro commented May 21, 2024

/covered

@openjdk openjdk bot added the clean label May 21, 2024
@bridgekeeper bridgekeeper bot added the oca-verify Needs verification of OCA signatory status label May 21, 2024
@bridgekeeper
Copy link

bridgekeeper bot commented May 21, 2024

Thank you! Please allow for a few business days to verify that your employer has signed the OCA. Also, please note that pull requests that are pending an OCA check will not usually be evaluated, so your patience is appreciated!

@vieiro
Copy link
Contributor Author

vieiro commented May 21, 2024

/signed too

@bridgekeeper bridgekeeper bot removed oca Needs verification of OCA signatory status oca-verify Needs verification of OCA signatory status labels May 29, 2024
@openjdk
Copy link

openjdk bot commented May 29, 2024

⚠️ @vieiro 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 the rfr Pull request is ready for review label May 29, 2024
@mlbridge
Copy link

mlbridge bot commented May 29, 2024

Webrevs

@vieiro
Copy link
Contributor Author

vieiro commented May 29, 2024

/approval

@openjdk
Copy link

openjdk bot commented May 29, 2024

@vieiro usage: /approval [<id>] (request|cancel) [<text>]

@vieiro
Copy link
Contributor Author

vieiro commented May 30, 2024

/approval JDK-8240226 request Backport DeflateIn_InflateOut: incorrectly assumes size of zipped file

@openjdk
Copy link

openjdk bot commented May 30, 2024

@vieiro
JDK-8240226: The approval request has been created successfully.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels May 30, 2024
@vieiro
Copy link
Contributor Author

vieiro commented Jun 3, 2024

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 3, 2024
@openjdk
Copy link

openjdk bot commented Jun 3, 2024

@vieiro
Your change (at version 4471e60) is now ready to be sponsored by a Committer.

@TheRealMDoerr
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 3, 2024

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

  • 4556aa9: 8317288: [macos] java/awt/Window/Grab/GrabTest.java: Press on the outside area didn't cause ungrab
  • 7b377ac: 8329013: StackOverflowError when starting Apache Tomcat with signed jar
  • 31a780d: 8276819: javax/print/PrintServiceLookup/FlushCustomClassLoader.java fails to free
  • c35d30d: 8331263: Bump update version for OpenJDK: jdk-11.0.25
  • 47fd86c: 8273153: Consolidate file_exists into os:file_exists
  • 8a489e5: 8293887: AArch64 build failure with GCC 12 due to maybe-uninitialized warning in libfdlibm k_rem_pio2.c
  • 3533374: 8312194: test/hotspot/jtreg/applications/ctw/modules/jdk_crypto_ec.java cannot handle empty modules
  • b7596f3: 8316138: Add GlobalSign 2 TLS root certificates
  • b8ee2aa: 8326591: New test JmodExcludedFiles.java fails on Windows when --with-external-symbols-in-bundles=public is used

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 3, 2024

@TheRealMDoerr @vieiro Pushed as commit 69f4ac1.

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

@vieiro
Copy link
Contributor Author

vieiro commented Jun 3, 2024

Thank you, @TheRealMDoerr !

@vieiro vieiro deleted the backports/JDK-8240226 branch September 5, 2024 08:22
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
Development

Successfully merging this pull request may close these issues.

2 participants