From c49eb02208dfa642bdde0ac002d02ecceb4f0e34 Mon Sep 17 00:00:00 2001
From: Kelly O'Hair <ohair@openjdk.org>
Date: Mon, 4 Jan 2010 15:52:38 -0800
Subject: [PATCH] 6911108: These tests do not work with CYGWIN: java/util

Reviewed-by: tbell, alanb
---
 jdk/test/java/util/Currency/PropertiesTest.sh               | 2 +-
 jdk/test/java/util/PluggableLocale/ExecTest.sh              | 2 +-
 jdk/test/java/util/ResourceBundle/Bug6299235Test.sh         | 4 ++--
 jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh | 2 +-
 jdk/test/java/util/ServiceLoader/basic.sh                   | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jdk/test/java/util/Currency/PropertiesTest.sh b/jdk/test/java/util/Currency/PropertiesTest.sh
index b058c3d8534..420e9f92cea 100644
--- a/jdk/test/java/util/Currency/PropertiesTest.sh
+++ b/jdk/test/java/util/Currency/PropertiesTest.sh
@@ -34,7 +34,7 @@ case "$OS" in
     PS=":"
     FS="/"
     ;;
-  Windows* )
+  Windows* | CYGWIN* )
     PS=";"
     FS="\\"
     ;;
diff --git a/jdk/test/java/util/PluggableLocale/ExecTest.sh b/jdk/test/java/util/PluggableLocale/ExecTest.sh
index b68a28cd848..76b339ee4c3 100644
--- a/jdk/test/java/util/PluggableLocale/ExecTest.sh
+++ b/jdk/test/java/util/PluggableLocale/ExecTest.sh
@@ -62,7 +62,7 @@ case "$OS" in
     PS=":"
     FS="/"
     ;;
-  Windows* )
+  Windows* | CYGWIN* )
     PS=";"
     FS="\\"
     ;;
diff --git a/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh b/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh
index 6da631ebe4c..bb2d6a69165 100644
--- a/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh
+++ b/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh
@@ -35,7 +35,7 @@ case "$OS" in
     PATHSEP=":"
     FILESEP="/"
     ;;
-  Windows* )
+  Windows* | CYGWIN* )
     PATHSEP=";"
     FILESEP="\\"
     ;;
@@ -63,7 +63,7 @@ else
 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 --git a/jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh b/jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh
index 449162ccc54..ac89bc136c6 100644
--- a/jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh
+++ b/jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh
@@ -69,7 +69,7 @@ export LC_ALL
 HAS_S=NO
 
 case "`uname`" in
-Windows*)
+Windows* | CYGWIN* )
     DEL=";"
     ;;
 SunOS)
diff --git a/jdk/test/java/util/ServiceLoader/basic.sh b/jdk/test/java/util/ServiceLoader/basic.sh
index 4f80b17f553..68695678738 100644
--- a/jdk/test/java/util/ServiceLoader/basic.sh
+++ b/jdk/test/java/util/ServiceLoader/basic.sh
@@ -50,9 +50,9 @@ case "$OS" in
       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