Skip to content

Conversation

@luchenlin
Copy link

@luchenlin luchenlin commented May 31, 2024

I backport this for parity with 21.0.5-oracle.


Progress

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

Issue

  • JDK-8322008: Exclude some CDS tests from running with -Xshare:off (Enhancement - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 629

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 31, 2024

👋 Welcome back andrewlu! 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 May 31, 2024

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

8322008: Exclude some CDS tests from running with -Xshare:off

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

  • 74f637b: 8324577: [REDO] - [IMPROVE] OPEN_MAX is no longer the max limit on macOS >= 10.6 for RLIMIT_NOFILE
  • f5025eb: 8305072: Win32ShellFolder2.compareTo is inconsistent
  • 4b0a789: 8329004: Update Libpng to 1.6.43
  • dc831aa: 8328953: JEditorPane.read throws ChangedCharSetException
  • 4b3df73: 8325179: Race in BasicDirectoryModel.validateFileCache
  • e4ac1a4: 8325382: (fc) FileChannel.transferTo throws IOException when position equals size
  • 88c366c: 8329126: No native wrappers generated anymore with -XX:-TieredCompilation after JDK-8251462
  • 5666863: 8329134: Reconsider TLAB zapping
  • f5f5870: 8331771: ZGC: Remove OopMapCacheAlloc_lock ordering workaround
  • 33a43e5: 8327040: Problemlist ActionListenerCalledTwiceTest.java test failing in macos14
  • ... and 12 more: https://git.openjdk.org/jdk21u-dev/compare/9971c63ef8b3cf5b060c853b11fe81a1905ee655...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 changed the title Backport 4d32c607a4b496bf2bb09e54167ecbbab5569a0c 8322008: Exclude some CDS tests from running with -Xshare:off May 31, 2024
@openjdk
Copy link

openjdk bot commented May 31, 2024

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels May 31, 2024
@openjdk
Copy link

openjdk bot commented May 31, 2024

⚠️ @luchenlin 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 31, 2024
@mlbridge
Copy link

mlbridge bot commented May 31, 2024

Webrevs

@openjdk openjdk bot added approval Requires approval; will be removed when approval is received ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Jun 3, 2024
@luchenlin
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 4, 2024

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

  • f1c7553: 8310201: Reduce verbose locale output in -XshowSettings launcher option
  • d51b8ea: 8323577: C2 SuperWord: remove AlignVector restrictions on IR tests added in JDK-8305055
  • bbc8cde: 8322330: JavadocHelperTest.java OOMEs with Parallel GC and ZGC
  • 9c0896c: 8315031: YoungPLABSize and OldPLABSize not aligned by ObjectAlignmentInBytes
  • 792b7b1: 8328785: IOException: Symbol not found: C_GetInterface for PKCS11 interface prior to V3.0
  • 594b309: 8261433: Better pkcs11 performance for libpkcs11:C_EncryptInit/libpkcs11:C_DecryptInit
  • 041b874: 8314225: SIGSEGV in JavaThread::is_lock_owned
  • e26c5f0: 8331077: nroff man page update for jar tool
  • 2144c0e: 8330748: ByteArrayOutputStream.writeTo(OutputStream) pins carrier
  • 77e894f: 8328999: Update GIFlib to 5.2.2
  • ... and 22 more: https://git.openjdk.org/jdk21u-dev/compare/9971c63ef8b3cf5b060c853b11fe81a1905ee655...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 4, 2024

@luchenlin Pushed as commit 46c0e1e.

💡 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 Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

1 participant