stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8314283: Support for NSS tests on aarch64 platforms

Browse Source 
Reviewed-by: rhalade
This commit is contained in:
Matthew Donovan 2023-10-11 16:44:22 +00:00
parent 3f6d01687c
commit 2a80160960
2 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/jdk/sun/security/pkcs11/KeyStore/ClientAuth.java
View File

@ -389,6 +389,10 @@ public class ClientAuth extends PKCS11Test {
* Our client thread just died.
*/
System.err.println("Client died...");
// if the exception is thrown before connecting to the
// server, the test will time out and the exception will
// be lost/hidden.
e.printStackTrace(System.err);
clientException = e;
}
});

55
test/jdk/sun/security/pkcs11/PKCS11Test.java
View File

@ -79,6 +79,11 @@ public abstract class PKCS11Test {
private static final char[] HEX_DIGITS = "0123456789abcdef".toCharArray();
private static final SecureRandom srdm = new SecureRandom();
// Version of the NSS artifact. This coincides with the version of
// the NSS version
private static final String NSS_BUNDLE_VERSION = "3.91";
private static final String NSSLIB = "jpg.tests.jdk.nsslib";
static double nss_version = -1;
static ECCState nss_ecc_status = ECCState.Basic;
@ -807,18 +812,21 @@ public abstract class PKCS11Test {
private static String fetchNssLib(String osId) {
switch (osId) {
case "Windows-x86-32":
return fetchNssLib(WINDOWS_X86.class);
case "Windows-amd64-64":
return fetchNssLib(WINDOWS_X64.class);
case "MacOSX-x86_64-64":
return fetchNssLib(MACOSX_X64.class);
case "MacOSX-aarch64-64":
return fetchNssLib(MACOSX_AARCH64.class);
case "Linux-amd64-64":
return fetchNssLib(LINUX_X64.class);
case "Linux-aarch64-64":
return fetchNssLib(LINUX_AARCH64.class);
default:
return null;
}
@ -828,8 +836,8 @@ public abstract class PKCS11Test {
String path = null;
try {
path = ArtifactResolver.resolve(clazz).entrySet().stream()
.findAny().get().getValue() + File.separator + "nsslib"
+ File.separator;
.findAny().get().getValue() + File.separator + "nss"
+ File.separator + "lib" + File.separator;
} catch (ArtifactResolverException e) {
Throwable cause = e.getCause();
if (cause == null) {
@ -931,34 +939,43 @@ public abstract class PKCS11Test {
public static enum ECCState {None, Basic, Extended}
@Artifact(
organization = "jpg.tests.jdk.nsslib",
organization = NSSLIB,
name = "nsslib-windows_x64",
revision = "3.46-VS2017",
revision = NSS_BUNDLE_VERSION,
extension = "zip")
private static class WINDOWS_X64 {
}
@Artifact(
organization = "jpg.tests.jdk.nsslib",
name = "nsslib-windows_x86",
revision = "3.46-VS2017",
extension = "zip")
private static class WINDOWS_X86 {
}
@Artifact(
organization = "jpg.tests.jdk.nsslib",
organization = NSSLIB,
name = "nsslib-macosx_x64",
revision = "3.46",
revision = NSS_BUNDLE_VERSION,
extension = "zip")
private static class MACOSX_X64 {
}
@Artifact(
organization = "jpg.tests.jdk.nsslib",
organization = NSSLIB,
name = "nsslib-macosx_aarch64",
revision = NSS_BUNDLE_VERSION,
extension = "zip")
private static class MACOSX_AARCH64 {
}
@Artifact(
organization = NSSLIB,
name = "nsslib-linux_x64",
revision = "3.46",
revision = NSS_BUNDLE_VERSION,
extension = "zip")
private static class LINUX_X64 {
}
@Artifact(
organization = NSSLIB,
name = "nsslib-linux_aarch64",
revision = NSS_BUNDLE_VERSION,
extension = "zip"
)
private static class LINUX_AARCH64{
}
}