Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6911112: Tests do not work with CYGWIN: javax/imageio/, javax/script/, and sun/misc/
authorohair
Mon, 04 Jan 2010 15:45:30 -0800
changeset 4660 913e357c2e08
parent 4659 3ef31fe2879b
child 4661 1dad7f2ea780
6911112: Tests do not work with CYGWIN: javax/imageio/, javax/script/, and sun/misc/ Reviewed-by: tbell, alanb
jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh file | annotate | diff | comparison | revisions
jdk/test/javax/script/CommonSetup.sh file | annotate | diff | comparison | revisions
jdk/test/javax/script/ProviderTest.sh file | annotate | diff | comparison | revisions
jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh file | annotate | diff | comparison | revisions 
--- a/jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Mon Jan 04 15:41:54 2010 -0800
+++ b/jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Mon Jan 04 15:45:30 2010 -0800
@@ -92,7 +92,7 @@
       TMP="/tmp"
       ;;
 
-   Windows_95 | Windows_98 | Windows_NT | Windows_ME )
+   Windows_95 | Windows_98 | Windows_NT | Windows_ME | CYGWIN* )
       VAR="A different value for Win32"
       DEFAULT_JDK=/usr/local/java/jdk1.2/win32
       FILESEP="\\"
--- a/jdk/test/javax/script/CommonSetup.sh	Mon Jan 04 15:41:54 2010 -0800
+++ b/jdk/test/javax/script/CommonSetup.sh	Mon Jan 04 15:45:30 2010 -0800
@@ -49,6 +49,12 @@
     OS="Windows"
     FS="\\"
     ;;
+  CYGWIN* )
+    PS=";"
+    OS="Windows"
+    FS="\\"
+    isCygwin=true
+    ;;
   * )
     echo "Unrecognized system!"
     exit 1;
--- a/jdk/test/javax/script/ProviderTest.sh	Mon Jan 04 15:41:54 2010 -0800
+++ b/jdk/test/javax/script/ProviderTest.sh	Mon Jan 04 15:45:30 2010 -0800
@@ -46,5 +46,5 @@
 echo "Running test ..."
 
 $JAVA -classpath \
-  ${TESTCLASSES}${PS}${TESTCLASSES}/dummy.jar \
+  "${TESTCLASSES}${PS}${TESTCLASSES}/dummy.jar" \
   ProviderTest
--- a/jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh	Mon Jan 04 15:41:54 2010 -0800
+++ b/jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh	Mon Jan 04 15:45:30 2010 -0800
@@ -44,7 +44,7 @@
     PS=":"
     FS="/"
     ;;
-  Windows* )
+  Windows* | CYGWIN* )
     PS=";"
     FS="\\"
     ;;
@@ -59,6 +59,6 @@
 ${TESTJAVA}${FS}bin${FS}jar xvf testclasses.jar "fo o.class"
 ${TESTJAVA}${FS}bin${FS}javac -d ${TESTCLASSES} ${TESTSRC}${FS}ClassnameCharTest.java
 
-${TESTJAVA}${FS}bin${FS}java -classpath ${TESTCLASSES}${PS}${TESTCLASSES}${FS}sun${FS}misc${FS}URLClassPath ClassnameCharTest
+${TESTJAVA}${FS}bin${FS}java -classpath "${TESTCLASSES}${PS}${TESTCLASSES}${FS}sun${FS}misc${FS}URLClassPath" ClassnameCharTest
 
 rm -rf "fo o.class" testclasses.jar
jdk-sandbox