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

8295424: adjust timeout for another JLI GetObjectSizeIntrinsicsTest.java subtest #1816

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Sep 28, 2023

I backport this for parity with 17.0.10-oracle.

Skipped patch for Fuzz.java. That file is not in 17. It was introduced by 8284161: Implementation of Virtual Threads (Preview).
Will mark as clean.


Progress

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

Issues

  • JDK-8295424: adjust timeout for another JLI GetObjectSizeIntrinsicsTest.java subtest (Bug - P4 - Approved)
  • JDK-8297367: disable TestRedirectLinks.java in slowdebug mode (Sub-task - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1816

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 28, 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 6e5470525d5236901c219146f363d4860e6b8008 8295424: adjust timeout for another JLI GetObjectSizeIntrinsicsTest.java subtest Sep 28, 2023
@openjdk
Copy link

openjdk bot commented Sep 28, 2023

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 Sep 28, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 28, 2023

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Sep 28, 2023

/clean

@openjdk openjdk bot added the clean label Sep 28, 2023
@openjdk
Copy link

openjdk bot commented Sep 28, 2023

@GoeLin This backport pull request is now marked as clean

@openjdk
Copy link

openjdk bot commented Sep 28, 2023

⚠️ @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 the approval label Sep 29, 2023
@RealCLanger
Copy link
Contributor

Hm, maybe you should remove the issue JDK-8297369? As you had to skip the patch to Fuzz.java for the reasons mentioned above, you should probably not mark JDK-8297369 as resolved...

@openjdk
Copy link

openjdk bot commented Oct 3, 2023

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

@GoeLin
Copy link
Member Author

GoeLin commented Oct 3, 2023

This is an interesting one. The two additional issues were added by Skara automagically as they are noted in the original change comment already.
Let's see whether it is re-added after me removing it :)

@GoeLin
Copy link
Member Author

GoeLin commented Oct 3, 2023

/issue remove JDK-8297369

@openjdk
Copy link

openjdk bot commented Oct 3, 2023

@GoeLin
Removing additional issue from issue list: 8297369.

@openjdk
Copy link

openjdk bot commented Oct 3, 2023

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

8295424: adjust timeout for another JLI GetObjectSizeIntrinsicsTest.java subtest
8297367: disable TestRedirectLinks.java in slowdebug mode

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

  • 26fb0f8: 8299748: java/util/zip/Deinflate.java failing on s390x
  • 91332e2: 8298869: Update ConnectionTest.java for changes to TLS implementation
  • 28adafc: 8298873: Update IllegalRecordVersion.java for changes to TLS implementation
  • fca2792: 8198668: MemoryPoolMBean/isUsageThresholdExceeded/isexceeded001/TestDescription.java still failing
  • 54533e5: 8271887: mark hotspot runtime/CDSCompressedKPtrs tests which ignore external VM flags
  • 644e410: 8271828: mark hotspot runtime/classFileParserBug tests which ignore external VM flags
  • 003f4f4: 8271829: mark hotspot runtime/Throwable tests which ignore external VM flags
  • 174c329: 8296437: NMT incurs costs if disabled
  • cb535e2: 8308592: Framework for CA interoperability testing
  • 9fce30a: 8298867: Basics.java fails with SSL handshake exception
  • ... and 2 more: https://git.openjdk.org/jdk17u-dev/compare/9404b2b16beaaa536a3698a7641cd9fd2e22d9f1...master

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 ready Pull request is ready to be integrated and removed approval labels Oct 3, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Oct 3, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Oct 3, 2023

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

  • 26fb0f8: 8299748: java/util/zip/Deinflate.java failing on s390x
  • 91332e2: 8298869: Update ConnectionTest.java for changes to TLS implementation
  • 28adafc: 8298873: Update IllegalRecordVersion.java for changes to TLS implementation
  • fca2792: 8198668: MemoryPoolMBean/isUsageThresholdExceeded/isexceeded001/TestDescription.java still failing
  • 54533e5: 8271887: mark hotspot runtime/CDSCompressedKPtrs tests which ignore external VM flags
  • 644e410: 8271828: mark hotspot runtime/classFileParserBug tests which ignore external VM flags
  • 003f4f4: 8271829: mark hotspot runtime/Throwable tests which ignore external VM flags
  • 174c329: 8296437: NMT incurs costs if disabled
  • cb535e2: 8308592: Framework for CA interoperability testing
  • 9fce30a: 8298867: Basics.java fails with SSL handshake exception
  • ... and 2 more: https://git.openjdk.org/jdk17u-dev/compare/9404b2b16beaaa536a3698a7641cd9fd2e22d9f1...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 3, 2023

@GoeLin Pushed as commit ceafbb7.

💡 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_8295424 branch October 3, 2023 20:44
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