8366182: Some PKCS11Tests are being skipped when they shouldn't

[rm-gh-8]

Backporting JDK-8366182: Some PKCS11Tests are being skipped when they shouldn't.

For parity with Oracle JDK. The commit fixes PKCS11 tests to correctly parse NSS version numbers by comparing major and minor versions separately instead of treating them as doubles, which incorrectly ordered versions like 3.111 between 3.11 and 3.12.

This PR is not clean (not detected by GHA) because it skips a commit (openjdk/jdk@db85090) which implements JEP 486, whick is not included in JDK 21.

The merge conflict is just the copyright notice in test/jdk/sun/security/pkcs11/Secmod/AddTrustedCert.java, and the changes intended in this PR should still be applicable.

jdk:

 * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.

jdk21u-dev:

 * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.

For parity with Oracle JDK. Already backported to 25.

Ran related tests on linux-x64, linux-aarch64, macos-aarch64 and windows-x64:

make test TEST=test/jdk/sun/security/pkcs11

Results attached:

windows-x64-specific-test.log
macos-aarch64-specific-test.log
linux-x64-specific-test.log
linux-aarch64-specific-test.log

---

Progress

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

Issue

• JDK-8366182: Some PKCS11Tests are being skipped when they shouldn't (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2652

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

Using diff file

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

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back rm-gh-8! 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]

@rm-gh-8 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:

8366182: Some PKCS11Tests are being skipped when they shouldn't

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

• 7f14687: 8373704: Improve "SocketException: Protocol family unavailable" message
• f95246e: 8374711: Hotspot runtime/CommandLine/OptionsValidation/TestOptionsWithRanges fails without printing the option name
• 33109d6: 8378353: [PPC64] StringCoding.countPositives causes errors when the length is not a proper 32 bit int
• ... and 16 more: https://git.openjdk.org/jdk21u-dev/compare/493ec0e379559df72bd5c5e1a3632e8615eb522e...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.

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]

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

[openjdk]

⚠️ @rm-gh-8 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.

[rm-gh-8]

/approval request for backport of JDK-8366182: Some PKCS11Tests are being skipped when they shouldn't.

This is a test fix.

For parity with Oracle JDK. Already backported to 25.

[openjdk]

@rm-gh-8
8366182: The approval request has been created successfully.

[mlbridge]

Webrevs

• 00: Full (6c447e9a)

[rm-gh-8]

/integrate

[openjdk]

@rm-gh-8
Your change (at version 6c447e9) is now ready to be sponsored by a Committer.

[simonis]

The Windows build failure seems to be unrelated to this test-only change.

[simonis]

/sponsor

[openjdk]

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

• 35a542a: 8360882: Tests throw SkippedException when they should fail
• 415434e: 8365861: test/jdk/sun/security/pkcs11/Provider/ tests skipped without SkippedException
• 4ed8c0c: 8286865: vmTestbase/vm/mlvm/meth/stress/jni/nativeAndMH/Test.java fails with Out of space in CodeCache
• ... and 24 more: https://git.openjdk.org/jdk21u-dev/compare/493ec0e379559df72bd5c5e1a3632e8615eb522e...master

Your commit was automatically rebased without conflicts.

[openjdk]

@simonis @rm-gh-8 Pushed as commit 8084a06.

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