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

8319128: sun/security/pkcs11 tests fail on OL 7.9 aarch64 #2598

Closed
wants to merge 9 commits into from

Conversation

luchenlin
Copy link
Contributor

@luchenlin luchenlin commented Mar 12, 2024

I backport this for parity with 11.0.24-oracle.

Follow 21-dev backport.
test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java
Backport to the origin file.

depends on #2620


Progress

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

Issues

  • JDK-8319128: sun/security/pkcs11 tests fail on OL 7.9 aarch64 (Bug - P3 - Approved)
  • JDK-8319136: Skip pkcs11 tests on linux-aarch64 (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2598

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 12, 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 openjdk bot changed the title Backport 1f9b03e597d87679964e8772c6bea538c74feb2c 8319128: sun/security/pkcs11 tests fail on OL 7.9 aarch64 Mar 12, 2024
@openjdk
Copy link

openjdk bot commented Mar 12, 2024

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

@openjdk openjdk bot added the backport label Mar 12, 2024
@luchenlin
Copy link
Contributor Author

/issue JDK-8319136

@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 12, 2024
@openjdk
Copy link

openjdk bot commented Mar 12, 2024

@luchenlin
Updating description of additional solved issue: 8319136: Skip pkcs11 tests on linux-aarch64.

@mlbridge
Copy link

mlbridge bot commented Mar 12, 2024

Webrevs

…319128

# Conflicts:
#	test/jdk/sun/security/pkcs11/PKCS11Test.java
@openjdk
Copy link

openjdk bot commented Mar 13, 2024

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

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

8319128: sun/security/pkcs11 tests fail on OL 7.9 aarch64
8319136: Skip pkcs11 tests on linux-aarch64

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

  • 2e46aad: 8268974: GetJREPath() JLI function fails to locate libjava.so if not standard Java launcher is used
  • eca3696: 8310923: Refactor Currency tests to use JUnit
  • 2f285fd: 8323994: gtest runner repeats test name for every single gtest assertion
  • 9ac4063: 8299677: Formatter.format might take a long time to format an integer or floating-point
  • 6808c5c: 8320005: Allow loading of shared objects with .a extension on AIX
  • 910eb0e: 8306714: Open source few Swing event and AbstractAction tests
  • 1bbf93c: 8305943: Open source few AWT Focus related tests
  • 8e46e37: 8305942: Open source several AWT Focus related tests
  • fa8f02e: 8318727: Enable parallelism in vmTestbase/vm/gc/concurrent tests
  • e922114: 8280546: Remove hard-coded 127.0.0.1 loopback address

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.

Copy link
Contributor

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

LGTM.

@openjdk
Copy link

openjdk bot commented Mar 15, 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 approval and removed approval labels Mar 18, 2024
i556354 added 5 commits March 19, 2024 10:27
…319128

# Conflicts:
#	test/hotspot/jtreg/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java
#	test/jdk/sun/security/pkcs11/PKCS11Test.java
…319128

# Conflicts:
#	test/hotspot/jtreg/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java
@openjdk openjdk bot added approval and removed approval labels Apr 2, 2024
@luchenlin
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 5, 2024

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

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Apr 5, 2024
@luchenlin
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 9, 2024

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

  • 2e46aad: 8268974: GetJREPath() JLI function fails to locate libjava.so if not standard Java launcher is used
  • eca3696: 8310923: Refactor Currency tests to use JUnit
  • 2f285fd: 8323994: gtest runner repeats test name for every single gtest assertion
  • 9ac4063: 8299677: Formatter.format might take a long time to format an integer or floating-point
  • 6808c5c: 8320005: Allow loading of shared objects with .a extension on AIX
  • 910eb0e: 8306714: Open source few Swing event and AbstractAction tests
  • 1bbf93c: 8305943: Open source few AWT Focus related tests
  • 8e46e37: 8305942: Open source several AWT Focus related tests
  • fa8f02e: 8318727: Enable parallelism in vmTestbase/vm/gc/concurrent tests
  • e922114: 8280546: Remove hard-coded 127.0.0.1 loopback address

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 9, 2024

@luchenlin Pushed as commit aa16bfe.

💡 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 integrated Pull request has been integrated
2 participants