changeset 4543:f5120b47f93d

7083664: test hard code of using c:/temp but this dir might not exist Reviewed-by: xuelei, ohair
author weijun
date Wed, 31 Aug 2011 09:22:50 +0800
parents 8a51f0e24380
children a5a28b040714
files test/lib/security/java.policy/Ext_AllPolicy.sh test/sun/security/tools/jarsigner/AlgOptions.sh test/sun/security/tools/jarsigner/PercentSign.sh test/sun/security/tools/jarsigner/diffend.sh test/sun/security/tools/jarsigner/oldsig.sh test/sun/security/tools/keytool/AltProviderPath.sh test/sun/security/tools/keytool/SecretKeyKS.sh test/sun/security/tools/keytool/StandardAlgName.sh test/sun/security/tools/keytool/i18n.sh test/sun/security/tools/keytool/resource.sh test/sun/security/tools/policytool/Alias.sh test/sun/security/tools/policytool/ChangeUI.sh test/sun/security/tools/policytool/OpenPolicy.sh test/sun/security/tools/policytool/SaveAs.sh test/sun/security/tools/policytool/UpdatePermissions.sh test/sun/security/tools/policytool/UsePolicy.sh test/sun/security/tools/policytool/i18n.sh
diffstat 17 files changed, 2 insertions(+), 48 deletions(-) [+]
line wrap: on
line diff
--- a/test/lib/security/java.policy/Ext_AllPolicy.sh	Tue Aug 30 11:53:11 2011 -0700
+++ b/test/lib/security/java.policy/Ext_AllPolicy.sh	Wed Aug 31 09:22:50 2011 +0800
@@ -54,19 +54,16 @@
     NULL=/dev/null
     PS=":"
     FS="/"
-    TMP=/tmp
     ;;
   CYGWIN* )
     NULL=/dev/null
     PS=";"
     FS="/"
-    TMP=/tmp
     ;;
   Windows_95 | Windows_98 | Windows_NT )
     NULL=NUL
     PS=";"
     FS="\\"
-    TMP="c:/temp"
     ;;
   * )
     echo "Unrecognized system!"
--- a/test/sun/security/tools/jarsigner/AlgOptions.sh	Tue Aug 30 11:53:11 2011 -0700
+++ b/test/sun/security/tools/jarsigner/AlgOptions.sh	Wed Aug 31 09:22:50 2011 +0800
@@ -51,21 +51,18 @@
     PS=":"
     FS="/"
     CP="${FS}bin${FS}cp -f"
-    TMP=/tmp
     ;;
   CYGWIN* )
     NULL=/dev/null
     PS=";"
     FS="/"
     CP="cp -f"
-    TMP=/tmp
     ;;
   Windows_* )
     NULL=NUL
     PS=";"
     FS="\\"
     CP="cp -f"
-    TMP="c:/temp"
     ;;
   * )
     echo "Unrecognized operating system!"
--- a/test/sun/security/tools/jarsigner/PercentSign.sh	Tue Aug 30 11:53:11 2011 -0700
+++ b/test/sun/security/tools/jarsigner/PercentSign.sh	Wed Aug 31 09:22:50 2011 +0800
@@ -51,21 +51,18 @@
     PS=":"
     FS="/"
     CP="${FS}bin${FS}cp -f"
-    TMP=/tmp
     ;;
   CYGWIN* )
     NULL=/dev/null
     PS=";"
     FS="/"
     CP="cp -f"
-    TMP=/tmp
     ;;
   Windows_* )
     NULL=NUL
     PS=";"
     FS="\\"
     CP="cp -f"
-    TMP="c:/temp"
     ;;
   * )
     echo "Unrecognized operating system!"
--- a/test/sun/security/tools/jarsigner/diffend.sh	Tue Aug 30 11:53:11 2011 -0700
+++ b/test/sun/security/tools/jarsigner/diffend.sh	Wed Aug 31 09:22:50 2011 +0800
@@ -46,21 +46,18 @@
     PS=":"
     FS="/"
     CP="${FS}bin${FS}cp -f"
-    TMP=/tmp
     ;;
   CYGWIN* )
     NULL=/dev/null
     PS=";"
     FS="/"
     CP="cp -f"
-    TMP=/tmp
     ;;
   Windows_* )
     NULL=NUL
     PS=";"
     FS="\\"
     CP="cp -f"
-    TMP="c:/temp"
     ;;
   * )
     echo "Unrecognized operating system!"
--- a/test/sun/security/tools/jarsigner/oldsig.sh	Tue Aug 30 11:53:11 2011 -0700
+++ b/test/sun/security/tools/jarsigner/oldsig.sh	Wed Aug 31 09:22:50 2011 +0800
@@ -47,21 +47,18 @@
     PS=":"
     FS="/"
     CP="${FS}bin${FS}cp -f"
-    TMP=/tmp
     ;;
   CYGWIN* )
     NULL=/dev/null
     PS=";"
     FS="/"
     CP="cp -f"
-    TMP=/tmp
     ;;
   Windows_* )
     NULL=NUL
     PS=";"
     FS="\\"
     CP="cp -f"
-    TMP="c:/temp"
     ;;
   * )
     echo "Unrecognized operating system!"
--- a/test/sun/security/tools/keytool/AltProviderPath.sh	Tue Aug 30 11:53:11 2011 -0700
+++ b/test/sun/security/tools/keytool/AltProviderPath.sh	Wed Aug 31 09:22:50 2011 +0800
@@ -50,19 +50,16 @@
     NULL=/dev/null
     PS=":"
     FS="/"
-    TMP=/tmp
     ;;
   CYGWIN* )
     NULL=/dev/null
     PS=";"
     FS="/"
-    TMP=/tmp
     ;;
   Windows_* )
     NULL=NUL
     PS=";"
     FS="\\"
-    TMP="c:/temp"
     ;;
   * )
     echo "Unrecognized operating system!"
--- a/test/sun/security/tools/keytool/SecretKeyKS.sh	Tue Aug 30 11:53:11 2011 -0700
+++ b/test/sun/security/tools/keytool/SecretKeyKS.sh	Wed Aug 31 09:22:50 2011 +0800
@@ -49,19 +49,16 @@
     NULL=/dev/null
     PS=":"
     FS="/"
-    TMP=/tmp
     ;;
   CYGWIN* )
     NULL=/dev/null
     PS=";"
     FS="/"
-    TMP=/tmp
     ;;
   Windows_* )
     NULL=NUL
     PS=";"
     FS="\\"
-    TMP="c:/temp"
     ;;
   * )
     echo "Unrecognized operating system!"
--- a/test/sun/security/tools/keytool/StandardAlgName.sh	Tue Aug 30 11:53:11 2011 -0700
+++ b/test/sun/security/tools/keytool/StandardAlgName.sh	Wed Aug 31 09:22:50 2011 +0800
@@ -50,19 +50,16 @@
     NULL=/dev/null
     PS=":"
     FS="/"
-    TMP=/tmp
     ;;
   CYGWIN* )
     NULL=/dev/null
     PS=";"
     FS="/"
-    TMP=/tmp
     ;;
   Windows_* )
     NULL=NUL
     PS=";"
     FS="\\"
-    TMP="c:/temp"
     ;;
   * )
     echo "Unrecognized operating system!"
--- a/test/sun/security/tools/keytool/i18n.sh	Tue Aug 30 11:53:11 2011 -0700
+++ b/test/sun/security/tools/keytool/i18n.sh	Wed Aug 31 09:22:50 2011 +0800
@@ -50,19 +50,16 @@
     NULL=/dev/null
     PS=":"
     FS="/"
-    TMP=/tmp
     ;;
   CYGWIN* )
     NULL=/dev/null
     PS=";"
     FS="/"
-    TMP=/tmp
     ;;
   Windows* )
     NULL=NUL
     PS=";"
     FS="\\"
-    TMP="c:/temp"
     ;;
   * )
     echo "Unrecognized system!"
--- a/test/sun/security/tools/keytool/resource.sh	Tue Aug 30 11:53:11 2011 -0700
+++ b/test/sun/security/tools/keytool/resource.sh	Wed Aug 31 09:22:50 2011 +0800
@@ -46,17 +46,14 @@
   SunOS | Linux )
     NULL=/dev/null
     FS="/"
-    TMP=/tmp
     ;;
   CYGWIN* )
     NULL=/dev/null
     FS="/"
-    TMP=/tmp
     ;;
   Windows_* )
     NULL=NUL
     FS="\\"
-    TMP="c:/temp"
     ;;
   * )
     echo "Unrecognized operating system!"
@@ -65,13 +62,11 @@
 esac
 
 # the test code
-${TESTJAVA}${FS}bin${FS}keytool > ${TMP}${FS}temp_file_40875602475 2> ${NULL}
-grep MissingResourceException ${TMP}${FS}temp_file_40875602475
+${TESTJAVA}${FS}bin${FS}keytool > temp_file_40875602475 2> ${NULL}
+grep MissingResourceException temp_file_40875602475
 
 if [ $? -eq 0 ]; then 
-    rm ${TMP}${FS}temp_file_40875602475
     exit 1
 fi
 
-rm ${TMP}${FS}temp_file_40875602475
 exit 0
--- a/test/sun/security/tools/policytool/Alias.sh	Tue Aug 30 11:53:11 2011 -0700
+++ b/test/sun/security/tools/policytool/Alias.sh	Wed Aug 31 09:22:50 2011 +0800
@@ -51,13 +51,11 @@
     NULL=/dev/null
     PS=":"
     FS="/"
-    TMP=/tmp
     ;;
   Windows* )
     NULL=NUL
     PS=";"
     FS="\\"
-    TMP="c:/temp"
     ;;
   * )
     echo "Unrecognized system!"
--- a/test/sun/security/tools/policytool/ChangeUI.sh	Tue Aug 30 11:53:11 2011 -0700
+++ b/test/sun/security/tools/policytool/ChangeUI.sh	Wed Aug 31 09:22:50 2011 +0800
@@ -50,13 +50,11 @@
     NULL=/dev/null
     PS=":"
     FS="/"
-    TMP=/tmp
     ;;
   Windows* )
     NULL=NUL
     PS=";"
     FS="\\"
-    TMP="c:/temp"
     ;;
   * )
     echo "Unrecognized system!"
--- a/test/sun/security/tools/policytool/OpenPolicy.sh	Tue Aug 30 11:53:11 2011 -0700
+++ b/test/sun/security/tools/policytool/OpenPolicy.sh	Wed Aug 31 09:22:50 2011 +0800
@@ -50,13 +50,11 @@
     NULL=/dev/null
     PS=":"
     FS="/"
-    TMP=/tmp
     ;;
   Windows* )
     NULL=NUL
     PS=";"
     FS="\\"
-    TMP="c:/temp"
     ;;
   * )
     echo "Unrecognized system!"
--- a/test/sun/security/tools/policytool/SaveAs.sh	Tue Aug 30 11:53:11 2011 -0700
+++ b/test/sun/security/tools/policytool/SaveAs.sh	Wed Aug 31 09:22:50 2011 +0800
@@ -51,13 +51,11 @@
     NULL=/dev/null
     PS=":"
     FS="/"
-    TMP=/tmp
     ;;
   Windows* )
     NULL=NUL
     PS=";"
     FS="\\"
-    TMP="c:/temp"
     ;;
   * )
     echo "Unrecognized system!"
--- a/test/sun/security/tools/policytool/UpdatePermissions.sh	Tue Aug 30 11:53:11 2011 -0700
+++ b/test/sun/security/tools/policytool/UpdatePermissions.sh	Wed Aug 31 09:22:50 2011 +0800
@@ -50,13 +50,11 @@
     NULL=/dev/null
     PS=":"
     FS="/"
-    TMP=/tmp
     ;;
   Windows* )
     NULL=NUL
     PS=";"
     FS="\\"
-    TMP="c:/temp"
     ;;
   * )
     echo "Unrecognized system!"
--- a/test/sun/security/tools/policytool/UsePolicy.sh	Tue Aug 30 11:53:11 2011 -0700
+++ b/test/sun/security/tools/policytool/UsePolicy.sh	Wed Aug 31 09:22:50 2011 +0800
@@ -50,13 +50,11 @@
     NULL=/dev/null
     PS=":"
     FS="/"
-    TMP=/tmp
     ;;
   Windows* )
     NULL=NUL
     PS=";"
     FS="\\"
-    TMP="c:/temp"
     ;;
   * )
     echo "Unrecognized system!"
--- a/test/sun/security/tools/policytool/i18n.sh	Tue Aug 30 11:53:11 2011 -0700
+++ b/test/sun/security/tools/policytool/i18n.sh	Wed Aug 31 09:22:50 2011 +0800
@@ -50,13 +50,11 @@
     NULL=/dev/null
     PS=":"
     FS="/"
-    TMP=/tmp
     ;;
   Windows* )
     NULL=NUL
     PS=";"
     FS="\\"
-    TMP="c:/temp"
     ;;
   * )
     echo "Unrecognized system!"