Mercurial > hg > openjdk > jdk6 > jdk
changeset 1539:db12cca58eea
6911129: These tests do not work with CYGWIN: java/lang
Reviewed-by: tbell, alanb
| author | ohair |
|---|---|
| date | Tue, 20 Dec 2016 03:34:40 +0000 |
| parents | f422cf3f7cc8 |
| children | 5f667c651109 |
| files | test/java/beans/Introspector/Test5102804.java test/java/lang/StringCoding/CheckEncodings.sh test/java/lang/System/finalization/FinExit.sh test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh |
| diffstat | 4 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/test/java/beans/Introspector/Test5102804.java Tue Dec 20 03:24:31 2016 +0000 +++ b/test/java/beans/Introspector/Test5102804.java Tue Dec 20 03:34:40 2016 +0000 @@ -24,6 +24,7 @@ /* * @test * @bug 5102804 + * @ignore This test is not predictable with regards to GC * @summary Tests memory leak * @author Sergey Malenkov */
--- a/test/java/lang/StringCoding/CheckEncodings.sh Tue Dec 20 03:24:31 2016 +0000 +++ b/test/java/lang/StringCoding/CheckEncodings.sh Tue Dec 20 03:34:40 2016 +0000 @@ -31,7 +31,7 @@ OS=`uname -s` case "$OS" in SunOS | Linux | Darwin | AIX ) ;; - Windows* ) + Windows* | CYGWIN* ) echo "Passed"; exit 0 ;; * ) echo "Unrecognized system!" ; exit 1 ;; esac
--- a/test/java/lang/System/finalization/FinExit.sh Tue Dec 20 03:24:31 2016 +0000 +++ b/test/java/lang/System/finalization/FinExit.sh Tue Dec 20 03:34:40 2016 +0000 @@ -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 if [ "x$x" != "x1" ]; then echo On-exit finalizer invoked twice
--- a/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Tue Dec 20 03:24:31 2016 +0000 +++ b/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Tue Dec 20 03:34:40 2016 +0000 @@ -48,11 +48,17 @@ PS=":" FS="/" ;; - Windows* | CYGWIN*) + Windows*) PS=";" OS="Windows" FS="\\" ;; + CYGWIN*) + PS=";" + OS="Windows" + FS="\\" + isCygwin=true + ;; * ) echo "Unrecognized system!" exit 1;