提交 c3d5684f 编写于 作者: W weijun

7083664: test hard code of using c:/temp but this dir might not exist

Reviewed-by: xuelei, ohair
上级 9b290695
...@@ -54,19 +54,16 @@ case "$OS" in ...@@ -54,19 +54,16 @@ case "$OS" in
NULL=/dev/null NULL=/dev/null
PS=":" PS=":"
FS="/" FS="/"
TMP=/tmp
;; ;;
CYGWIN* ) CYGWIN* )
NULL=/dev/null NULL=/dev/null
PS=";" PS=";"
FS="/" FS="/"
TMP=/tmp
;; ;;
Windows_95 | Windows_98 | Windows_NT ) Windows_95 | Windows_98 | Windows_NT )
NULL=NUL NULL=NUL
PS=";" PS=";"
FS="\\" FS="\\"
TMP="c:/temp"
;; ;;
* ) * )
echo "Unrecognized system!" echo "Unrecognized system!"
......
...@@ -51,21 +51,18 @@ case "$OS" in ...@@ -51,21 +51,18 @@ case "$OS" in
PS=":" PS=":"
FS="/" FS="/"
CP="${FS}bin${FS}cp -f" CP="${FS}bin${FS}cp -f"
TMP=/tmp
;; ;;
CYGWIN* ) CYGWIN* )
NULL=/dev/null NULL=/dev/null
PS=";" PS=";"
FS="/" FS="/"
CP="cp -f" CP="cp -f"
TMP=/tmp
;; ;;
Windows_* ) Windows_* )
NULL=NUL NULL=NUL
PS=";" PS=";"
FS="\\" FS="\\"
CP="cp -f" CP="cp -f"
TMP="c:/temp"
;; ;;
* ) * )
echo "Unrecognized operating system!" echo "Unrecognized operating system!"
......
...@@ -51,21 +51,18 @@ case "$OS" in ...@@ -51,21 +51,18 @@ case "$OS" in
PS=":" PS=":"
FS="/" FS="/"
CP="${FS}bin${FS}cp -f" CP="${FS}bin${FS}cp -f"
TMP=/tmp
;; ;;
CYGWIN* ) CYGWIN* )
NULL=/dev/null NULL=/dev/null
PS=";" PS=";"
FS="/" FS="/"
CP="cp -f" CP="cp -f"
TMP=/tmp
;; ;;
Windows_* ) Windows_* )
NULL=NUL NULL=NUL
PS=";" PS=";"
FS="\\" FS="\\"
CP="cp -f" CP="cp -f"
TMP="c:/temp"
;; ;;
* ) * )
echo "Unrecognized operating system!" echo "Unrecognized operating system!"
......
...@@ -46,21 +46,18 @@ case "$OS" in ...@@ -46,21 +46,18 @@ case "$OS" in
PS=":" PS=":"
FS="/" FS="/"
CP="${FS}bin${FS}cp -f" CP="${FS}bin${FS}cp -f"
TMP=/tmp
;; ;;
CYGWIN* ) CYGWIN* )
NULL=/dev/null NULL=/dev/null
PS=";" PS=";"
FS="/" FS="/"
CP="cp -f" CP="cp -f"
TMP=/tmp
;; ;;
Windows_* ) Windows_* )
NULL=NUL NULL=NUL
PS=";" PS=";"
FS="\\" FS="\\"
CP="cp -f" CP="cp -f"
TMP="c:/temp"
;; ;;
* ) * )
echo "Unrecognized operating system!" echo "Unrecognized operating system!"
......
...@@ -47,21 +47,18 @@ case "$OS" in ...@@ -47,21 +47,18 @@ case "$OS" in
PS=":" PS=":"
FS="/" FS="/"
CP="${FS}bin${FS}cp -f" CP="${FS}bin${FS}cp -f"
TMP=/tmp
;; ;;
CYGWIN* ) CYGWIN* )
NULL=/dev/null NULL=/dev/null
PS=";" PS=";"
FS="/" FS="/"
CP="cp -f" CP="cp -f"
TMP=/tmp
;; ;;
Windows_* ) Windows_* )
NULL=NUL NULL=NUL
PS=";" PS=";"
FS="\\" FS="\\"
CP="cp -f" CP="cp -f"
TMP="c:/temp"
;; ;;
* ) * )
echo "Unrecognized operating system!" echo "Unrecognized operating system!"
......
...@@ -50,19 +50,16 @@ case "$OS" in ...@@ -50,19 +50,16 @@ case "$OS" in
NULL=/dev/null NULL=/dev/null
PS=":" PS=":"
FS="/" FS="/"
TMP=/tmp
;; ;;
CYGWIN* ) CYGWIN* )
NULL=/dev/null NULL=/dev/null
PS=";" PS=";"
FS="/" FS="/"
TMP=/tmp
;; ;;
Windows_* ) Windows_* )
NULL=NUL NULL=NUL
PS=";" PS=";"
FS="\\" FS="\\"
TMP="c:/temp"
;; ;;
* ) * )
echo "Unrecognized operating system!" echo "Unrecognized operating system!"
......
...@@ -49,19 +49,16 @@ case "$OS" in ...@@ -49,19 +49,16 @@ case "$OS" in
NULL=/dev/null NULL=/dev/null
PS=":" PS=":"
FS="/" FS="/"
TMP=/tmp
;; ;;
CYGWIN* ) CYGWIN* )
NULL=/dev/null NULL=/dev/null
PS=";" PS=";"
FS="/" FS="/"
TMP=/tmp
;; ;;
Windows_* ) Windows_* )
NULL=NUL NULL=NUL
PS=";" PS=";"
FS="\\" FS="\\"
TMP="c:/temp"
;; ;;
* ) * )
echo "Unrecognized operating system!" echo "Unrecognized operating system!"
......
...@@ -50,19 +50,16 @@ case "$OS" in ...@@ -50,19 +50,16 @@ case "$OS" in
NULL=/dev/null NULL=/dev/null
PS=":" PS=":"
FS="/" FS="/"
TMP=/tmp
;; ;;
CYGWIN* ) CYGWIN* )
NULL=/dev/null NULL=/dev/null
PS=";" PS=";"
FS="/" FS="/"
TMP=/tmp
;; ;;
Windows_* ) Windows_* )
NULL=NUL NULL=NUL
PS=";" PS=";"
FS="\\" FS="\\"
TMP="c:/temp"
;; ;;
* ) * )
echo "Unrecognized operating system!" echo "Unrecognized operating system!"
......
...@@ -50,19 +50,16 @@ case "$OS" in ...@@ -50,19 +50,16 @@ case "$OS" in
NULL=/dev/null NULL=/dev/null
PS=":" PS=":"
FS="/" FS="/"
TMP=/tmp
;; ;;
CYGWIN* ) CYGWIN* )
NULL=/dev/null NULL=/dev/null
PS=";" PS=";"
FS="/" FS="/"
TMP=/tmp
;; ;;
Windows* ) Windows* )
NULL=NUL NULL=NUL
PS=";" PS=";"
FS="\\" FS="\\"
TMP="c:/temp"
;; ;;
* ) * )
echo "Unrecognized system!" echo "Unrecognized system!"
......
...@@ -46,17 +46,14 @@ case "$OS" in ...@@ -46,17 +46,14 @@ case "$OS" in
SunOS | Linux ) SunOS | Linux )
NULL=/dev/null NULL=/dev/null
FS="/" FS="/"
TMP=/tmp
;; ;;
CYGWIN* ) CYGWIN* )
NULL=/dev/null NULL=/dev/null
FS="/" FS="/"
TMP=/tmp
;; ;;
Windows_* ) Windows_* )
NULL=NUL NULL=NUL
FS="\\" FS="\\"
TMP="c:/temp"
;; ;;
* ) * )
echo "Unrecognized operating system!" echo "Unrecognized operating system!"
...@@ -65,13 +62,11 @@ case "$OS" in ...@@ -65,13 +62,11 @@ case "$OS" in
esac esac
# the test code # the test code
${TESTJAVA}${FS}bin${FS}keytool > ${TMP}${FS}temp_file_40875602475 2> ${NULL} ${TESTJAVA}${FS}bin${FS}keytool > temp_file_40875602475 2> ${NULL}
grep MissingResourceException ${TMP}${FS}temp_file_40875602475 grep MissingResourceException temp_file_40875602475
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
rm ${TMP}${FS}temp_file_40875602475
exit 1 exit 1
fi fi
rm ${TMP}${FS}temp_file_40875602475
exit 0 exit 0
...@@ -51,13 +51,11 @@ case "$OS" in ...@@ -51,13 +51,11 @@ case "$OS" in
NULL=/dev/null NULL=/dev/null
PS=":" PS=":"
FS="/" FS="/"
TMP=/tmp
;; ;;
Windows* ) Windows* )
NULL=NUL NULL=NUL
PS=";" PS=";"
FS="\\" FS="\\"
TMP="c:/temp"
;; ;;
* ) * )
echo "Unrecognized system!" echo "Unrecognized system!"
......
...@@ -50,13 +50,11 @@ case "$OS" in ...@@ -50,13 +50,11 @@ case "$OS" in
NULL=/dev/null NULL=/dev/null
PS=":" PS=":"
FS="/" FS="/"
TMP=/tmp
;; ;;
Windows* ) Windows* )
NULL=NUL NULL=NUL
PS=";" PS=";"
FS="\\" FS="\\"
TMP="c:/temp"
;; ;;
* ) * )
echo "Unrecognized system!" echo "Unrecognized system!"
......
...@@ -50,13 +50,11 @@ case "$OS" in ...@@ -50,13 +50,11 @@ case "$OS" in
NULL=/dev/null NULL=/dev/null
PS=":" PS=":"
FS="/" FS="/"
TMP=/tmp
;; ;;
Windows* ) Windows* )
NULL=NUL NULL=NUL
PS=";" PS=";"
FS="\\" FS="\\"
TMP="c:/temp"
;; ;;
* ) * )
echo "Unrecognized system!" echo "Unrecognized system!"
......
...@@ -51,13 +51,11 @@ case "$OS" in ...@@ -51,13 +51,11 @@ case "$OS" in
NULL=/dev/null NULL=/dev/null
PS=":" PS=":"
FS="/" FS="/"
TMP=/tmp
;; ;;
Windows* ) Windows* )
NULL=NUL NULL=NUL
PS=";" PS=";"
FS="\\" FS="\\"
TMP="c:/temp"
;; ;;
* ) * )
echo "Unrecognized system!" echo "Unrecognized system!"
......
...@@ -50,13 +50,11 @@ case "$OS" in ...@@ -50,13 +50,11 @@ case "$OS" in
NULL=/dev/null NULL=/dev/null
PS=":" PS=":"
FS="/" FS="/"
TMP=/tmp
;; ;;
Windows* ) Windows* )
NULL=NUL NULL=NUL
PS=";" PS=";"
FS="\\" FS="\\"
TMP="c:/temp"
;; ;;
* ) * )
echo "Unrecognized system!" echo "Unrecognized system!"
......
...@@ -50,13 +50,11 @@ case "$OS" in ...@@ -50,13 +50,11 @@ case "$OS" in
NULL=/dev/null NULL=/dev/null
PS=":" PS=":"
FS="/" FS="/"
TMP=/tmp
;; ;;
Windows* ) Windows* )
NULL=NUL NULL=NUL
PS=";" PS=";"
FS="\\" FS="\\"
TMP="c:/temp"
;; ;;
* ) * )
echo "Unrecognized system!" echo "Unrecognized system!"
......
...@@ -50,13 +50,11 @@ case "$OS" in ...@@ -50,13 +50,11 @@ case "$OS" in
NULL=/dev/null NULL=/dev/null
PS=":" PS=":"
FS="/" FS="/"
TMP=/tmp
;; ;;
Windows* ) Windows* )
NULL=NUL NULL=NUL
PS=";" PS=";"
FS="\\" FS="\\"
TMP="c:/temp"
;; ;;
* ) * )
echo "Unrecognized system!" echo "Unrecognized system!"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册