From 9dae7f5c55eade0d98d1d0dda1db4449c19e6e54 Mon Sep 17 00:00:00 2001
From: Vinnie Ryan <vinnie@openjdk.org>
Date: Mon, 2 Dec 2013 14:19:25 +0000
Subject: [PATCH] 8029369: Shell tests in sun/security/pkcs11/ do not compile
 PKCS11Test

Reviewed-by: mullan
---
 jdk/test/sun/security/pkcs11/KeyStore/Basic.sh              | 5 +++--
 jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh         | 5 +++--
 jdk/test/sun/security/pkcs11/KeyStore/Solaris.sh            | 5 +++--
 jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh | 5 +++--
 jdk/test/sun/security/pkcs11/Provider/Login.sh              | 5 +++--
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/jdk/test/sun/security/pkcs11/KeyStore/Basic.sh b/jdk/test/sun/security/pkcs11/KeyStore/Basic.sh
index ab7045f12a9..037b5d792ce 100644
--- a/jdk/test/sun/security/pkcs11/KeyStore/Basic.sh
+++ b/jdk/test/sun/security/pkcs11/KeyStore/Basic.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2013, 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
@@ -170,7 +170,8 @@ if [ "${RECOMPILE}" = "yes" ] ; then
     ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
 	-classpath ${TESTSRC}${FS}..${PS}${TESTSRC}${FS}loader.jar \
 	-d ${TESTCLASSES} \
-	${TESTSRC}${FS}Basic.java
+	${TESTSRC}${FS}Basic.java \
+	${TESTSRC}${FS}..${FS}PKCS11Test.java
 fi
 
 # run test
diff --git a/jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh b/jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh
index eb340c919d5..f889417d228 100644
--- a/jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh
+++ b/jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2013, 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
@@ -128,7 +128,8 @@ ${CHMOD} +w ${TESTCLASSES}${FS}key3.db
 ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
 	-classpath ${TESTSRC}${FS}..${PS}${TESTSRC}${FS}loader.jar \
 	-d ${TESTCLASSES} \
-	${TESTSRC}${FS}ClientAuth.java
+	${TESTSRC}${FS}ClientAuth.java \
+	${TESTSRC}${FS}..${FS}PKCS11Test.java
 
 # run test
 echo "Run ClientAuth ..."
diff --git a/jdk/test/sun/security/pkcs11/KeyStore/Solaris.sh b/jdk/test/sun/security/pkcs11/KeyStore/Solaris.sh
index 302ce50b3ed..2d34ef440af 100644
--- a/jdk/test/sun/security/pkcs11/KeyStore/Solaris.sh
+++ b/jdk/test/sun/security/pkcs11/KeyStore/Solaris.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2013, 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
@@ -140,7 +140,8 @@ if [ "${RECOMPILE}" = "yes" ] ; then
     ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
 	-classpath ${TESTSRC}${FS}..${PS}${TESTSRC}${FS}loader.jar \
 	-d ${TESTCLASSES} \
-	${TESTSRC}${FS}Basic.java
+	${TESTSRC}${FS}Basic.java \
+	${TESTSRC}${FS}..${FS}PKCS11Test.java
 fi
 
 # run test
diff --git a/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh b/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh
index b1cf0d9082c..30b245c81a0 100644
--- a/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh
+++ b/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2013, 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
@@ -99,7 +99,8 @@ esac
 ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
         -classpath ${TESTSRC}${FS}.. \
         -d ${TESTCLASSES} \
-        ${TESTSRC}${FS}ConfigQuotedString.java
+        ${TESTSRC}${FS}ConfigQuotedString.java \
+        ${TESTSRC}${FS}..${FS}PKCS11Test.java
 
 # run test
 
diff --git a/jdk/test/sun/security/pkcs11/Provider/Login.sh b/jdk/test/sun/security/pkcs11/Provider/Login.sh
index cbbcb06d318..a1f6b132c9e 100644
--- a/jdk/test/sun/security/pkcs11/Provider/Login.sh
+++ b/jdk/test/sun/security/pkcs11/Provider/Login.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2013, 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
@@ -108,7 +108,8 @@ ${CHMOD} +w ${TESTCLASSES}${FS}key3.db
 ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
         -classpath ${TESTSRC}${FS}.. \
         -d ${TESTCLASSES} \
-        ${TESTSRC}${FS}Login.java
+        ${TESTSRC}${FS}Login.java \
+        ${TESTSRC}${FS}..${FS}PKCS11Test.java
 
 # run test