changeset 8499:daa9f87dfd5a

7145960: sun/security/mscapi/ShortRSAKey1024.sh failing on windows Reviewed-by: vinnie, wetmore
author xuelei
date Tue, 18 Oct 2016 02:40:06 +0100
parents e5c39738ce1f
children f5b12664604a
files test/sun/security/mscapi/ShortRSAKey1024.sh
diffstat 1 files changed, 15 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/test/sun/security/mscapi/ShortRSAKey1024.sh	Tue Oct 18 00:18:15 2016 +0100
+++ b/test/sun/security/mscapi/ShortRSAKey1024.sh	Tue Oct 18 02:40:06 2016 +0100
@@ -52,6 +52,15 @@
 
 OS=`uname -s`
 case "$OS" in
+  SunOS | Linux | Darwin | CYGWIN* )
+    FS="/"
+    ;;
+  Windows_* )
+    FS="\\"
+    ;;
+esac
+
+case "$OS" in
     Windows* | CYGWIN* )
 
         echo "Removing the keypair if it already exists (for unknown reason)..."
@@ -62,7 +71,7 @@
             -alias 7106773.$BITS
 
         echo "Creating a temporary RSA keypair in the Windows-My store..."
-        ${TESTJAVA}/bin/keytool \
+        ${TESTJAVA}${FS}bin${FS}keytool \
             -genkeypair \
             -storetype Windows-My \
             -keyalg RSA \
@@ -79,21 +88,22 @@
 
         echo
         echo "Running the test..."
-        ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\ShortRSAKeyWithinTLS.java
-        ${TESTJAVA}/bin/java ${TESTVMOPTS} ShortRSAKeyWithinTLS 7106773.$BITS $BITS \
+        ${TESTJAVA}${FS}bin${FS}javac -d . \
+            ${TESTSRC}${FS}ShortRSAKeyWithinTLS.java
+        ${TESTJAVA}${FS}bin${FS}java ShortRSAKeyWithinTLS 7106773.$BITS $BITS \
             TLSv1.2 TLS_DHE_RSA_WITH_AES_128_CBC_SHA
 
         rc=$?
 
         echo
         echo "Removing the temporary RSA keypair from the Windows-My store..."
-        ${TESTJAVA}/bin/keytool \
+        ${TESTJAVA}${FS}bin${FS}keytool \
             -delete \
             -storetype Windows-My \
             -debug \
             -alias 7106773.$BITS
 
-        echo done.
+        echo "Done".
         exit $rc
         ;;