# HG changeset patch # User ohair # Date 1262649158 28800 # Node ID 49b8cbe45e6a6a4903087618319ca5112e08f3c8 # Parent 1dad7f2ea780e7e0868ab3e4bc53a7e4cfe80415 6911108: These tests do not work with CYGWIN: java/util Reviewed-by: tbell, alanb diff -r 1dad7f2ea780 -r 49b8cbe45e6a jdk/test/java/util/Currency/PropertiesTest.sh --- a/jdk/test/java/util/Currency/PropertiesTest.sh Mon Jan 04 15:49:34 2010 -0800 +++ b/jdk/test/java/util/Currency/PropertiesTest.sh Mon Jan 04 15:52:38 2010 -0800 @@ -34,7 +34,7 @@ PS=":" FS="/" ;; - Windows* ) + Windows* | CYGWIN* ) PS=";" FS="\\" ;; diff -r 1dad7f2ea780 -r 49b8cbe45e6a jdk/test/java/util/PluggableLocale/ExecTest.sh --- a/jdk/test/java/util/PluggableLocale/ExecTest.sh Mon Jan 04 15:49:34 2010 -0800 +++ b/jdk/test/java/util/PluggableLocale/ExecTest.sh Mon Jan 04 15:52:38 2010 -0800 @@ -62,7 +62,7 @@ PS=":" FS="/" ;; - Windows* ) + Windows* | CYGWIN* ) PS=";" FS="\\" ;; diff -r 1dad7f2ea780 -r 49b8cbe45e6a jdk/test/java/util/ResourceBundle/Bug6299235Test.sh --- a/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Mon Jan 04 15:49:34 2010 -0800 +++ b/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Mon Jan 04 15:52:38 2010 -0800 @@ -35,7 +35,7 @@ PATHSEP=":" FILESEP="/" ;; - Windows* ) + Windows* | CYGWIN* ) PATHSEP=";" FILESEP="\\" ;; @@ -63,7 +63,7 @@ fi if [ -d "${JRE_EXT_DIR}" ]; then - NEW_EXT_DIR=${JRE_EXT_DIR}${PATHSEP}${TESTSRC} + NEW_EXT_DIR="${JRE_EXT_DIR}${PATHSEP}${TESTSRC}" else NEW_EXT_DIR=${TESTSRC} fi diff -r 1dad7f2ea780 -r 49b8cbe45e6a jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh --- a/jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh Mon Jan 04 15:49:34 2010 -0800 +++ b/jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh Mon Jan 04 15:52:38 2010 -0800 @@ -69,7 +69,7 @@ HAS_S=NO case "`uname`" in -Windows*) +Windows* | CYGWIN* ) DEL=";" ;; SunOS) diff -r 1dad7f2ea780 -r 49b8cbe45e6a jdk/test/java/util/ServiceLoader/basic.sh --- a/jdk/test/java/util/ServiceLoader/basic.sh Mon Jan 04 15:49:34 2010 -0800 +++ b/jdk/test/java/util/ServiceLoader/basic.sh Mon Jan 04 15:52:38 2010 -0800 @@ -50,9 +50,9 @@ SEP='\;' ;; esac -JARD=`pwd`/x.jar -EXTD=`pwd`/x.ext -TESTD=`pwd`/x.test +JARD=x.jar +EXTD=x.ext +TESTD=x.test if [ \! -d $EXTD ]; then # Initialize