提交 af8c398b 编写于 作者: O ohair

6911129: These tests do not work with CYGWIN: java/lang

Reviewed-by: tbell, alanb
上级 ea255b83
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
/* /*
* @test * @test
* @bug 5102804 * @bug 5102804
* @ignore This test is not predictable with regards to GC
* @summary Tests memory leak * @summary Tests memory leak
* @author Sergey Malenkov * @author Sergey Malenkov
*/ */
......
...@@ -55,7 +55,7 @@ case "$OS" in ...@@ -55,7 +55,7 @@ case "$OS" in
Linux ) Linux )
FS="/" FS="/"
;; ;;
Windows* ) Windows* | CYGWIN* )
FS="\\" FS="\\"
;; ;;
esac esac
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
OS=`uname -s` OS=`uname -s`
case "$OS" in case "$OS" in
SunOS | Linux ) ;; SunOS | Linux ) ;;
Windows* ) Windows* | CYGWIN* )
echo "Passed"; exit 0 ;; echo "Passed"; exit 0 ;;
* ) echo "Unrecognized system!" ; exit 1 ;; * ) echo "Unrecognized system!" ; exit 1 ;;
esac esac
......
...@@ -24,7 +24,9 @@ ...@@ -24,7 +24,9 @@
# #
# #
x=`$TESTJAVA/bin/java -cp $TESTCLASSES FinExit`
# We only want the first character, Windows might add CRLF
x=`$TESTJAVA/bin/java -cp "$TESTCLASSES" FinExit | cut -c1`
echo $x echo $x
if [ "x$x" != "x1" ]; then if [ "x$x" != "x1" ]; then
echo On-exit finalizer invoked twice echo On-exit finalizer invoked twice
......
...@@ -49,6 +49,11 @@ case "$OS" in ...@@ -49,6 +49,11 @@ case "$OS" in
PS=":" PS=":"
FS="/" FS="/"
;; ;;
CYGWIN* )
NULL=/dev/null
PS=";"
FS="/"
;;
Windows* ) Windows* )
NULL=NUL NULL=NUL
PS=";" PS=";"
......
...@@ -43,11 +43,17 @@ case "$OS" in ...@@ -43,11 +43,17 @@ case "$OS" in
PS=":" PS=":"
FS="/" FS="/"
;; ;;
Windows* | CYGWIN*) Windows*)
PS=";" PS=";"
OS="Windows" OS="Windows"
FS="\\" FS="\\"
;; ;;
CYGWIN*)
PS=";"
OS="Windows"
FS="\\"
isCygwin=true
;;
* ) * )
echo "Unrecognized system!" echo "Unrecognized system!"
exit 1; exit 1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册