diff --git a/test/sun/security/pkcs11/KeyStore/Basic.sh b/test/sun/security/pkcs11/KeyStore/Basic.sh index ab7045f12a9fd4526df0e58e34a77719867f7981..037b5d792ce8aff677f42b1958e5e03ada2c654e 100644 --- a/test/sun/security/pkcs11/KeyStore/Basic.sh +++ b/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/test/sun/security/pkcs11/KeyStore/ClientAuth.sh b/test/sun/security/pkcs11/KeyStore/ClientAuth.sh index eb340c919d5c05d5410375a1c2aa9af941cade4f..f889417d2288a0dd027433b6a9c051b34971ff52 100644 --- a/test/sun/security/pkcs11/KeyStore/ClientAuth.sh +++ b/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/test/sun/security/pkcs11/KeyStore/Solaris.sh b/test/sun/security/pkcs11/KeyStore/Solaris.sh index 302ce50b3ed0196bd4c252c144bc41181395249e..2d34ef440afbeffaa862e57f700c32d8684170a1 100644 --- a/test/sun/security/pkcs11/KeyStore/Solaris.sh +++ b/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/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh b/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh index b1cf0d9082c99194e43e6abb1ad1ddbdb4447c55..30b245c81a05d9b579129ebe71c1968893e02057 100644 --- a/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh +++ b/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/test/sun/security/pkcs11/Provider/Login.sh b/test/sun/security/pkcs11/Provider/Login.sh index cbbcb06d3181593f98ab064bf5b140071228b87a..a1f6b132c9ee4268a039dc0d01bcb52e8b8d3891 100644 --- a/test/sun/security/pkcs11/Provider/Login.sh +++ b/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