changeset 2077:1d6f315e42f1

6911108: These tests do not work with CYGWIN: java/util Reviewed-by: tbell, alanb
author ohair
date Mon, 04 Jan 2010 15:52:38 -0800
parents 07fdd926aaea
children 6f2a5912f5be
files test/java/util/Currency/PropertiesTest.sh test/java/util/PluggableLocale/ExecTest.sh test/java/util/ResourceBundle/Bug6299235Test.sh test/java/util/ResourceBundle/Control/ExpirationTest.sh test/java/util/ServiceLoader/basic.sh
diffstat 5 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/test/java/util/Currency/PropertiesTest.sh	Mon Jan 04 15:49:34 2010 -0800
+++ b/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/test/java/util/PluggableLocale/ExecTest.sh	Mon Jan 04 15:49:34 2010 -0800
+++ b/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/test/java/util/ResourceBundle/Bug6299235Test.sh	Mon Jan 04 15:49:34 2010 -0800
+++ b/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/test/java/util/ResourceBundle/Control/ExpirationTest.sh	Mon Jan 04 15:49:34 2010 -0800
+++ b/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/test/java/util/ServiceLoader/basic.sh	Mon Jan 04 15:49:34 2010 -0800
+++ b/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