8047085: PKCS11/NSS tests failing intermittently on Windows

Reviewed-by: mullan
2014-06-18 15:05:29 +01:00 · 2014-06-18 15:05:29 +01:00 · 7d5e52ba49
commit 7d5e52ba49
parent ed7184cb9b
46 changed files with 2 additions and 3 deletions
--- a/jdk/THIRD_PARTY_README
+++ b/jdk/THIRD_PARTY_README
@ -1471,7 +1471,7 @@ source code repository. It is licensed under Mozilla Public License (MPL),
 version 2.0.

 The NSS libraries are supplied in executable form, built from unmodified
-NSS source code labeled with the "NSS_3.13.1_RTM" release tag.
+NSS source code labeled with the "NSS_3_16_RTM" HG tag.

 The NSS source code is available in the OpenJDK source code repository at:
    jdk/test/sun/security/pkcs11/nss/src
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.chk
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.chk
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.lib
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.lib
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.lib
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.lib
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssckbi.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssckbi.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.chk
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.chk
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.lib
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.chk
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.chk
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/sqlite3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/sqlite3.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.lib
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.chk
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.chk
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.lib
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.lib
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.lib
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.lib
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.chk
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.chk
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.lib
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.chk
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.chk
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/sqlite3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/sqlite3.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.dll
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.lib
--- a/jdk/test/sun/security/pkcs11/nss/src/MD5SUMS
+++ b/jdk/test/sun/security/pkcs11/nss/src/MD5SUMS
@ -1 +0,0 @@
-1390c8a35c667e05e542  nss-3.13.1.tar.gz
--- a/jdk/test/sun/security/pkcs11/nss/src/SHA1SUMS
+++ b/jdk/test/sun/security/pkcs11/nss/src/SHA1SUMS
@ -1 +0,0 @@
-d8e7ee9f9f1e0bfa2ea8b72d25727634fea130a6  nss-3.13.1.tar.gz
--- a/jdk/test/sun/security/pkcs11/nss/src/nss-3.13.1.tar.gz
+++ b/jdk/test/sun/security/pkcs11/nss/src/nss-3.13.1.tar.gz
--- a/jdk/test/sun/security/pkcs11/nss/src/nss-3.16_nspr-4.10_src.tar.gz
+++ b/jdk/test/sun/security/pkcs11/nss/src/nss-3.16_nspr-4.10_src.tar.gz
--- a/jdk/test/sun/security/pkcs11/nss/src/nss-3.16_nspr-4.10_src.tar.gz.sha256
+++ b/jdk/test/sun/security/pkcs11/nss/src/nss-3.16_nspr-4.10_src.tar.gz.sha256
@ -0,0 +1 @@
+d2374795528f9cf36de07bf7c77d8c8414bb5b4da12ee7c78a57ec90d68e3706  nss-3.16_nspr-4.10_src.tar.gz
				`@ -1 +0,0 @@`
				`d8e7ee9f9f1e0bfa2ea8b72d25727634fea130a6 nss-3.13.1.tar.gz`
				`@ -0,0 +1 @@`
				`d2374795528f9cf36de07bf7c77d8c8414bb5b4da12ee7c78a57ec90d68e3706 nss-3.16_nspr-4.10_src.tar.gz`