6911108: These tests do not work with CYGWIN: java/util
Reviewed-by: tbell, alanb
--- 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="\\"
;;
--- 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="\\"
;;
--- 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
--- 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)
--- 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