Skip to content

Commit 7518003

Browse files
committed
Exclude PBEIterationCountTest from the jdk1.4 and jdk1.3 test builds, as EncryptedPrivateKeyInfo.getKeySpec(Key, String) does not exist before Java 5.
1 parent f7fc619 commit 7518003

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

‎ant/jdk13.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,8 @@
418418
<exclude name="**/jce/provider/test/AEADTest.java" />
419419
<exclude name="**/jce/provider/test/ECEncodingTest.java" />
420420
<exclude name="**/jce/provider/test/CertLocaleTest.java" />
421+
<!-- uses EncryptedPrivateKeyInfo.getKeySpec(Key, String), which 1.3 does not have -->
422+
<exclude name="**/jce/provider/test/PBEIterationCountTest.java" />
421423
<exclude name="**/jce/provider/test/HardwareKeyInvalidKeyExceptionTest.java" />
422424
<!-- synced from ant/jdk14.xml's prov/src/test/java fileset -->
423425
<exclude name="**/jce/provider/test/JcajceParameterSpecTest.java" />

‎ant/jdk14.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,8 @@
275275
<exclude name="**/jce/provider/test/PKCS12SecretKeyStoreTest.java"/>
276276
<!-- uses java.security.interfaces.ECPrivateKey (Java 5) -->
277277
<exclude name="**/jce/provider/test/HardwareKeyInvalidKeyExceptionTest.java"/>
278+
<!-- uses EncryptedPrivateKeyInfo.getKeySpec(Key, String), which 1.4 does not have -->
279+
<exclude name="**/jce/provider/test/PBEIterationCountTest.java"/>
278280
<exclude name="**/DetDSATest.java"/>
279281
<exclude name="**/ECDSA5Test.java"/>
280282
<exclude name="**/CRL5Test.java"/>

0 commit comments

Comments
 (0)