--- a/test/jdk/sun/security/pkcs11/ec/TestECDSA.java Wed Jul 25 17:21:04 2018 -0700
+++ b/test/jdk/sun/security/pkcs11/ec/TestECDSA.java Thu Jul 26 08:46:27 2018 +0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -120,21 +120,22 @@
}
@Override
- public void main(Provider provider) throws Exception {
- long start = System.currentTimeMillis();
-
+ protected boolean skipTest(Provider provider) {
if (provider.getService("Signature", "SHA1withECDSA") == null) {
System.out.println("ECDSA not supported, skipping");
- return;
+ return true;
}
- if (isBadNSSVersion(provider)) {
- return;
+ if (isBadNSSVersion(provider) || isBadSolarisSparc(provider)) {
+ return true;
}
- if (isBadSolarisSparc(provider)) {
- return;
- }
+ return false;
+ }
+
+ @Override
+ public void main(Provider provider) throws Exception {
+ long start = System.currentTimeMillis();
/*
* PKCS11Test.main will remove this provider if needed