Mercurial > hg > openjdk > jdk6 > jdk
changeset 1540:5f667c651109
6867657: Many JSN tests do not run under cygwin
Reviewed-by: ohair
line wrap: on
line diff
--- a/test/java/net/Authenticator/B4933582.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/java/net/Authenticator/B4933582.sh Tue Dec 20 03:38:31 2016 +0000 @@ -30,6 +30,10 @@ PS=":" FS="/" ;; + CYGWIN* ) + PS=";" + FS="/" + ;; Windows* ) PS=";" FS="\\" @@ -39,7 +43,7 @@ exit 1; ;; esac -${TESTJAVA}${FS}bin${FS}javac -d . -classpath ${TESTSRC}${FS}..${FS}..${FS}..${FS}sun${FS}net${FS}www${FS}httptest ${TESTSRC}${FS}B4933582.java +${TESTJAVA}${FS}bin${FS}javac -d . -classpath "${TESTSRC}${FS}..${FS}..${FS}..${FS}sun${FS}net${FS}www${FS}httptest" ${TESTSRC}${FS}B4933582.java rm -f cache.ser auth.save -${TESTJAVA}${FS}bin${FS}java -classpath ${TESTSRC}${FS}..${FS}..${FS}..${FS}sun${FS}net${FS}www${FS}httptest${PS}. B4933582 first -${TESTJAVA}${FS}bin${FS}java -classpath ${TESTSRC}${FS}..${FS}..${FS}..${FS}sun${FS}net${FS}www${FS}httptest${PS}. B4933582 second +${TESTJAVA}${FS}bin${FS}java -classpath "${TESTSRC}${FS}..${FS}..${FS}..${FS}sun${FS}net${FS}www${FS}httptest${PS}." B4933582 first +${TESTJAVA}${FS}bin${FS}java -classpath "${TESTSRC}${FS}..${FS}..${FS}..${FS}sun${FS}net${FS}www${FS}httptest${PS}." B4933582 second
--- a/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Tue Dec 20 03:38:31 2016 +0000 @@ -34,6 +34,10 @@ PATHSEP=":" FILESEP="/" ;; + CYGWIN* ) + PATHSEP=";" + FILESEP="/" + ;; Windows* ) PATHSEP=";" FILESEP="\\"
--- a/test/java/net/Socket/OldSocketImpl.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/java/net/Socket/OldSocketImpl.sh Tue Dec 20 03:38:31 2016 +0000 @@ -32,6 +32,10 @@ PS=":" FS="/" ;; + CYGWIN* ) + PS=";" + FS="/" + ;; Windows* ) PS=";" FS="\\"
--- a/test/java/net/URL/B5086147.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/java/net/URL/B5086147.sh Tue Dec 20 03:38:31 2016 +0000 @@ -28,6 +28,10 @@ SunOS | Linux | Darwin | AIX ) exit 0 ;; + CYGWIN* ) + PS=";" + FS="/" + ;; Windows* ) PS=";" FS="\\"
--- a/test/java/net/URL/runconstructor.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/java/net/URL/runconstructor.sh Tue Dec 20 03:38:31 2016 +0000 @@ -31,6 +31,10 @@ PS=":" FS="/" ;; + CYGWIN* ) + PS=";" + FS="/" + ;; Windows* ) PS=";" FS="\\"
--- a/test/java/net/URLClassLoader/B5077773.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/java/net/URLClassLoader/B5077773.sh Tue Dec 20 03:38:31 2016 +0000 @@ -42,6 +42,10 @@ PS=":" FS="/" ;; + CYGWIN* ) + PS=";" + FS="/" + ;; Windows* ) PS=";" FS="\\"
--- a/test/java/net/URLClassLoader/sealing/checksealed.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/java/net/URLClassLoader/sealing/checksealed.sh Tue Dec 20 03:38:31 2016 +0000 @@ -31,6 +31,10 @@ PS=":" FS="/" ;; + CYGWIN* ) + PS=";" + FS="/" + ;; Windows* ) PS=";" FS="\\" @@ -45,10 +49,10 @@ if [ x"$TESTJAVA" = x ]; then TESTJAVA=$1; fi if [ x"$TESTSRC" = x ]; then TESTSRC=.; fi -CLASSPATH=.${PS}${TESTSRC}${FS}a${PS}${TESTSRC}${FS}b.jar +CLASSPATH=".${PS}${TESTSRC}${FS}a${PS}${TESTSRC}${FS}b.jar" -${TESTJAVA}${FS}bin${FS}javac -classpath ${CLASSPATH} -d . ${TESTSRC}${FS}CheckSealed.java -${TESTJAVA}${FS}bin${FS}java -cp ${CLASSPATH} CheckSealed 1 +${TESTJAVA}${FS}bin${FS}javac -classpath "${CLASSPATH}" -d . ${TESTSRC}${FS}CheckSealed.java +${TESTJAVA}${FS}bin${FS}java -cp "${CLASSPATH}" CheckSealed 1 if [ $? != 0 ]; then exit 1; fi -${TESTJAVA}${FS}bin${FS}java -cp ${CLASSPATH} CheckSealed 2 +${TESTJAVA}${FS}bin${FS}java -cp "${CLASSPATH}" CheckSealed 2 if [ $? != 0 ]; then exit 1; fi
--- a/test/java/net/URLConnection/6212146/test.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/java/net/URLConnection/6212146/test.sh Tue Dec 20 03:38:31 2016 +0000 @@ -41,6 +41,10 @@ PS=":" FS="/" ;; + CYGWIN* ) + PS=";" + FS="/" + ;; Windows* ) PS=";" FS="\\"
--- a/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Tue Dec 20 03:38:31 2016 +0000 @@ -58,6 +58,10 @@ PATHSEP=":" FILESEP="/" ;; + CYGWIN* ) + PATHSEP=";" + FILESEP="/" + ;; Windows* ) PATHSEP=";" FILESEP="\\" @@ -85,7 +89,7 @@ # run the test ${TESTJAVA}${FILESEP}bin${FILESEP}java \ - -classpath ${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar \ + -classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar" \ ClassLoaderDeadlock exit $?
--- a/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Tue Dec 20 03:38:31 2016 +0000 @@ -46,6 +46,10 @@ PATHSEP=":" FILESEP="/" ;; + CYGWIN* ) + PATHSEP=";" + FILESEP="/" + ;; Windows* ) PATHSEP=";" FILESEP="\\" @@ -58,5 +62,5 @@ JAVA="${TESTJAVA}${FILESEP}bin${FILESEP}java" -${JAVA} -cp ${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar Deadlock +${JAVA} -cp "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar" Deadlock
--- a/test/java/security/Security/signedfirst/Dyn.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/java/security/Security/signedfirst/Dyn.sh Tue Dec 20 03:38:31 2016 +0000 @@ -58,6 +58,10 @@ PATHSEP=":" FILESEP="/" ;; + CYGWIN* ) + PATHSEP=";" + FILESEP="/" + ;; Windows* ) PATHSEP=";" FILESEP="\\" @@ -80,7 +84,7 @@ # run the test ${TESTJAVA}${FILESEP}bin${FILESEP}java \ - -classpath ${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar \ + -classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar" \ DynSignedProvFirst exit $?
--- a/test/java/security/Security/signedfirst/Static.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/java/security/Security/signedfirst/Static.sh Tue Dec 20 03:38:31 2016 +0000 @@ -58,6 +58,10 @@ PATHSEP=":" FILESEP="/" ;; + CYGWIN* ) + PATHSEP=";" + FILESEP="/" + ;; Windows* ) PATHSEP=";" FILESEP="\\" @@ -74,14 +78,14 @@ # compile the test program ${TESTJAVA}${FILESEP}bin${FILESEP}javac \ - -classpath ${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar \ + -classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar" \ -d ${TESTCLASSES}${FILESEP} \ ${TESTSRC}${FILESEP}StaticSignedProvFirst.java # run the test cd ${TESTSRC}${FILESEP} ${TESTJAVA}${FILESEP}bin${FILESEP}java \ - -classpath ${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar \ + -classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar" \ -Djava.security.properties=file:${TESTSRC}${FILESEP}Static.props \ StaticSignedProvFirst
--- a/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Tue Dec 20 03:38:31 2016 +0000 @@ -56,6 +56,11 @@ PS=":" FS="/" ;; + CYGWIN* ) + NULL=/dev/null + PS=";" + FS="/" + ;; Windows* ) NULL=NUL PS=";" @@ -69,7 +74,7 @@ ${TESTJAVA}${FS}bin${FS}javac \ -d . \ - -classpath ${TESTSRC}${FS}P1.jar${PS}${TESTSRC}${FS}P2.jar \ + -classpath "${TESTSRC}${FS}P1.jar${PS}${TESTSRC}${FS}P2.jar" \ ${TESTSRC}${FS}FailOverTest.java if [ $? -ne 0 ]; then @@ -77,7 +82,7 @@ fi ${TESTJAVA}${FS}bin${FS}java \ - -classpath ${TESTSRC}${FS}P1.jar${PS}${TESTSRC}${FS}P2.jar${PS}. \ + -classpath "${TESTSRC}${FS}P1.jar${PS}${TESTSRC}${FS}P2.jar${PS}." \ FailOverTest result=$?
--- a/test/javax/security/auth/Subject/doAs/Test.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/javax/security/auth/Subject/doAs/Test.sh Tue Dec 20 03:38:31 2016 +0000 @@ -48,6 +48,11 @@ FS="/" RM="/bin/rm -f" ;; + CYGWIN* ) + PS=";" + FS="/" + RM="rm" + ;; Windows* ) PS=";" FS="\\"
--- a/test/lib/security/java.policy/Ext_AllPolicy.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/lib/security/java.policy/Ext_AllPolicy.sh Tue Dec 20 03:38:31 2016 +0000 @@ -56,6 +56,12 @@ FS="/" TMP=/tmp ;; + CYGWIN* ) + NULL=/dev/null + PS=";" + FS="/" + TMP=/tmp + ;; Windows_95 | Windows_98 | Windows_NT ) NULL=NUL PS=";"
--- a/test/sun/net/www/MarkResetTest.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/sun/net/www/MarkResetTest.sh Tue Dec 20 03:38:31 2016 +0000 @@ -32,6 +32,10 @@ PS=":" FS="/" ;; + CYGWIN* ) + PS=";" + FS="/" + ;; Windows* ) PS=";" FS="\\"
--- a/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh Tue Dec 20 03:38:31 2016 +0000 @@ -32,6 +32,10 @@ PS=":" FS="/" ;; + CYGWIN* ) + PS=";" + FS="/" + ;; Windows* ) PS=";" FS="\\"
--- a/test/sun/net/www/http/HttpClient/RetryPost.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/sun/net/www/http/HttpClient/RetryPost.sh Tue Dec 20 03:38:31 2016 +0000 @@ -32,6 +32,10 @@ PS=":" FS="/" ;; + CYGWIN* ) + PS=";" + FS="/" + ;; Windows* ) PS=";" FS="\\"
--- a/test/sun/net/www/protocol/jar/B5105410.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/sun/net/www/protocol/jar/B5105410.sh Tue Dec 20 03:38:31 2016 +0000 @@ -35,6 +35,10 @@ PS=":" FS="/" ;; + CYGWIN* ) + PS=";" + FS="/" + ;; Windows* ) PS=";" FS="\\"
--- a/test/sun/net/www/protocol/jar/jarbug/run.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/sun/net/www/protocol/jar/jarbug/run.sh Tue Dec 20 03:38:31 2016 +0000 @@ -28,23 +28,54 @@ # @summary various resource and classloading bugs related to jar files #set -x DEST=`pwd` + +OS=`uname -s` +case "$OS" in + SunOS ) + PS=":" + FS="/" + ;; + Linux ) + PS=":" + FS="/" + ;; + Windows* ) + PS=";" + FS="\\" + ;; + CYGWIN* ) + PS=";" + FS="/" + # + # javac does not like /cygdrive produced by `pwd`. + # + DEST=`cygpath -d ${DEST}` + ;; + * ) + echo "Unrecognized system!" + exit 1; + ;; +esac + # # build jar1 # -mkdir ${DEST}/jar1 -cd ${TESTSRC}/etc/jar1 -cp -r . ${DEST}/jar1 -${TESTJAVA}/bin/javac -d ${DEST}/jar1 ${TESTSRC}/src/jar1/LoadResourceBundle.java -${TESTJAVA}/bin/javac -d ${DEST}/jar1 ${TESTSRC}/src/jar1/GetResource.java -cd ${DEST}/jar1 -${TESTJAVA}/bin/jar cfM jar1.jar jar1 res1.txt +mkdir -p ${DEST}${FS}jar1 +cd ${TESTSRC}${FS}etc${FS}jar1 +cp -r . ${DEST}${FS}jar1 +${TESTJAVA}${FS}bin${FS}javac -d ${DEST}${FS}jar1 \ + ${TESTSRC}${FS}src${FS}jar1${FS}LoadResourceBundle.java +${TESTJAVA}${FS}bin${FS}javac -d ${DEST}${FS}jar1 \ + ${TESTSRC}${FS}src${FS}jar1${FS}GetResource.java +cd ${DEST}${FS}jar1 +${TESTJAVA}${FS}bin${FS}jar cfM jar1.jar jar1 res1.txt mv jar1.jar .. # # build the test sources and run them # -${TESTJAVA}/bin/javac -d ${DEST} ${TESTSRC}/src/test/*.java +${TESTJAVA}${FS}bin${FS}javac -d ${DEST} ${TESTSRC}${FS}src${FS}test${FS}*.java cd ${DEST} -${TESTJAVA}/bin/java RunAllTests +${TESTJAVA}${FS}bin${FS}java RunAllTests result=$? if [ "$result" -ne "0" ]; then exit 1
--- a/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Tue Dec 20 03:38:31 2016 +0000 @@ -74,6 +74,20 @@ CP="cp" CHMOD="chmod" ;; + CYGWIN* ) + FS="/" + PS=";" + CP="cp" + CHMOD="chmod" + # + # javac does not like /cygdrive produced by `pwd` + # + TESTSRC=`cygpath -d ${TESTSRC}` + ;; + * ) + echo "Unrecognized system!" + exit 1; + ;; esac # compile test
--- a/test/sun/security/pkcs11/Provider/Login.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/sun/security/pkcs11/Provider/Login.sh Tue Dec 20 03:38:31 2016 +0000 @@ -75,6 +75,20 @@ CP="cp" CHMOD="chmod" ;; + CYGWIN* ) + FS="/" + PS=";" + CP="cp" + CHMOD="chmod" + # + # javac does not like /cygdrive produced by `pwd` + # + TESTSRC=`cygpath -d ${TESTSRC}` + ;; + * ) + echo "Unrecognized system!" + exit 1; + ;; esac # first make cert/key DBs writable
--- a/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Tue Dec 20 03:38:31 2016 +0000 @@ -59,6 +59,10 @@ PS=":" FS="/" ;; + CYGWIN* ) + PS=";" + FS="/" + ;; Windows* ) PS=";" FS="\\"
--- a/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Tue Dec 20 03:38:31 2016 +0000 @@ -43,10 +43,17 @@ OS=`uname -s` case "$OS" in SunOS | Linux | Darwin | AIX ) + FILESEP="/" PATHSEP=":" ;; + CYGWIN* ) + FILESEP="/" + PATHSEP=";" + ;; + Windows* ) + FILESEP="\\" PATHSEP=";" ;; esac @@ -56,11 +63,13 @@ # # Compile the tests, package into their respective jars # -${TESTJAVA}/bin/javac -d . \ - ${TESTSRC}/NotifyHandshakeTest.java \ - ${TESTSRC}/NotifyHandshakeTestHeyYou.java -${TESTJAVA}/bin/jar -cvf com.jar com/NotifyHandshakeTest*.class -${TESTJAVA}/bin/jar -cvf edu.jar edu/NotifyHandshakeTestHeyYou.class +${TESTJAVA}${FILESEP}bin${FILESEP}javac -d . \ + ${TESTSRC}${FILESEP}NotifyHandshakeTest.java \ + ${TESTSRC}${FILESEP}NotifyHandshakeTestHeyYou.java +${TESTJAVA}${FILESEP}bin${FILESEP}jar -cvf com.jar \ + com${FILESEP}NotifyHandshakeTest*.class +${TESTJAVA}${FILESEP}bin${FILESEP}jar -cvf edu.jar \ + edu${FILESEP}NotifyHandshakeTestHeyYou.class # # Don't want the original class files to be used, because @@ -73,11 +82,11 @@ # This is the only thing we really care about as far as # test status goes. # -${TESTJAVA}/bin/java \ +${TESTJAVA}${FILESEP}bin${FILESEP}java \ -Dtest.src=${TESTSRC} \ -classpath "com.jar${PATHSEP}edu.jar" \ -Djava.security.manager \ - -Djava.security.policy=${TESTSRC}/NotifyHandshakeTest.policy \ + -Djava.security.policy=${TESTSRC}${FILESEP}NotifyHandshakeTest.policy \ com.NotifyHandshakeTest retval=$?
--- a/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Tue Dec 20 03:38:31 2016 +0000 @@ -36,6 +36,10 @@ PS=":" FS="/" ;; + CYGWIN* ) + PS=";" + FS="/" + ;; Windows* ) PS=";" FS="\\" @@ -46,6 +50,7 @@ ;; esac -${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}OriginServer.java ${TESTSRC}${FS}ProxyTunnelServer.java ${TESTSRC}${FS}PostThruProxy.java +${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}OriginServer.java \ + ${TESTSRC}${FS}ProxyTunnelServer.java ${TESTSRC}${FS}PostThruProxy.java ${TESTJAVA}${FS}bin${FS}java PostThruProxy ${HOSTNAME} ${TESTSRC} exit
--- a/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Tue Dec 20 03:38:31 2016 +0000 @@ -36,6 +36,10 @@ PS=":" FS="/" ;; + CYGWIN* ) + PS=";" + FS="/" + ;; Windows* ) PS=";" FS="\\" @@ -46,6 +50,8 @@ ;; esac -${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}OriginServer.java ${TESTSRC}${FS}ProxyTunnelServer.java ${TESTSRC}${FS}PostThruProxyWithAuth.java +${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}OriginServer.java \ + ${TESTSRC}${FS}ProxyTunnelServer.java \ + ${TESTSRC}${FS}PostThruProxyWithAuth.java ${TESTJAVA}${FS}bin${FS}java PostThruProxyWithAuth ${HOSTNAME} ${TESTSRC} exit
--- a/test/sun/security/tools/jarsigner/AlgOptions.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/sun/security/tools/jarsigner/AlgOptions.sh Tue Dec 20 03:38:31 2016 +0000 @@ -53,6 +53,13 @@ CP="${FS}bin${FS}cp -f" TMP=/tmp ;; + CYGWIN* ) + NULL=/dev/null + PS=";" + FS="/" + CP="cp -f" + TMP=/tmp + ;; Windows_* ) NULL=NUL PS=";"
--- a/test/sun/security/tools/jarsigner/PercentSign.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/sun/security/tools/jarsigner/PercentSign.sh Tue Dec 20 03:38:31 2016 +0000 @@ -53,6 +53,13 @@ CP="${FS}bin${FS}cp -f" TMP=/tmp ;; + CYGWIN* ) + NULL=/dev/null + PS=";" + FS="/" + CP="cp -f" + TMP=/tmp + ;; Windows_* ) NULL=NUL PS=";"
--- a/test/sun/security/tools/jarsigner/oldsig.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/sun/security/tools/jarsigner/oldsig.sh Tue Dec 20 03:38:31 2016 +0000 @@ -49,6 +49,13 @@ CP="${FS}bin${FS}cp -f" TMP=/tmp ;; + CYGWIN* ) + NULL=/dev/null + PS=";" + FS="/" + CP="cp -f" + TMP=/tmp + ;; Windows_* ) NULL=NUL PS=";"
--- a/test/sun/security/tools/keytool/AltProviderPath.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/sun/security/tools/keytool/AltProviderPath.sh Tue Dec 20 03:38:31 2016 +0000 @@ -52,6 +52,12 @@ FS="/" TMP=/tmp ;; + CYGWIN* ) + NULL=/dev/null + PS=";" + FS="/" + TMP=/tmp + ;; Windows_* ) NULL=NUL PS=";" @@ -66,14 +72,21 @@ # the test code #genkey -${TESTJAVA}${FS}bin${FS}keytool -genkey -v -alias dummyTestCA -keyalg "RSA" -keysize 1024 -sigalg "ShA1WithRSA" -dname "cn=Dummy Test CA, ou=JSN, o=JavaSoft, c=US" -validity 3650 -keypass storepass -keystore keystoreCA.dks -storepass storepass -storetype "dks" -provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES} +${TESTJAVA}${FS}bin${FS}keytool -genkey -v -alias dummyTestCA \ + -keyalg "RSA" -keysize 1024 -sigalg "ShA1WithRSA" \ + -dname "cn=Dummy Test CA, ou=JSN, o=JavaSoft, c=US" -validity 3650 \ + -keypass storepass -keystore keystoreCA.dks -storepass storepass \ + -storetype "dks" -provider "org.test.dummy.DummyProvider" \ + -providerPath ${TESTCLASSES} if [ $? -ne 0 ]; then exit 1 fi #Change keystore password -${TESTJAVA}${FS}bin${FS}keytool -storepasswd -new storepass2 -keystore keystoreCA.dks -storetype "dks" -storepass storepass -provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES} +${TESTJAVA}${FS}bin${FS}keytool -storepasswd -new storepass2 \ + -keystore keystoreCA.dks -storetype "dks" -storepass storepass \ + -provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES} if [ $? -ne 0 ]; then exit 1 @@ -81,21 +94,29 @@ #Change keystore key password -${TESTJAVA}${FS}bin${FS}keytool -keypasswd -alias "dummyTestCA" -keypass storepass -new keypass -keystore keystoreCA.dks -storetype "dks" -storepass storepass2 -provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES} +${TESTJAVA}${FS}bin${FS}keytool -keypasswd -alias "dummyTestCA" \ + -keypass storepass -new keypass -keystore keystoreCA.dks \ + -storetype "dks" -storepass storepass2 \ + -provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES} if [ $? -ne 0 ]; then exit 1 fi #Export certificate -${TESTJAVA}${FS}bin${FS}keytool -v -export -rfc -alias "dummyTestCA" -file "dummyTestCA.der" -keystore keystoreCA.dks -storetype "dks" -storepass storepass2 -provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES} +${TESTJAVA}${FS}bin${FS}keytool -v -export -rfc -alias "dummyTestCA" \ + -file "dummyTestCA.der" -keystore keystoreCA.dks -storetype "dks" \ + -storepass storepass2 -provider "org.test.dummy.DummyProvider" \ + -providerPath ${TESTCLASSES} if [ $? -ne 0 ]; then exit 1 fi #list keystore -${TESTJAVA}${FS}bin${FS}keytool -v -list -keystore keystoreCA.dks -storetype "dks" -storepass storepass2 -provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES} +${TESTJAVA}${FS}bin${FS}keytool -v -list -keystore keystoreCA.dks \ + -storetype "dks" -storepass storepass2 \ + -provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES} if [ $? -ne 0 ]; then exit 1
--- a/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Tue Dec 20 03:38:31 2016 +0000 @@ -59,6 +59,10 @@ PATHSEP=":" FILESEP="/" ;; + CYGWIN* ) + PATHSEP=";" + FILESEP="/" + ;; Windows* ) PATHSEP=";" FILESEP="\\"
--- a/test/sun/security/tools/keytool/SecretKeyKS.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/sun/security/tools/keytool/SecretKeyKS.sh Tue Dec 20 03:38:31 2016 +0000 @@ -51,6 +51,12 @@ FS="/" TMP=/tmp ;; + CYGWIN* ) + NULL=/dev/null + PS=";" + FS="/" + TMP=/tmp + ;; Windows_* ) NULL=NUL PS=";"
--- a/test/sun/security/tools/keytool/StandardAlgName.sh Tue Dec 20 03:34:40 2016 +0000 +++ b/test/sun/security/tools/keytool/StandardAlgName.sh Tue Dec 20 03:38:31 2016 +0000 @@ -52,6 +52,12 @@ FS="/" TMP=/tmp ;; + CYGWIN* ) + NULL=/dev/null + PS=";" + FS="/" + TMP=/tmp + ;; Windows_* ) NULL=NUL PS=";"