6911112: Tests do not work with CYGWIN: javax/imageio/, javax/script/, and sun/misc/

Reviewed-by: tbell, alanb
This commit is contained in:
Kelly O'Hair 2010-01-04 15:45:30 -08:00
parent 67582cd0a5
commit 5b5ca23ef0
4 changed files with 10 additions and 4 deletions

View File

@ -92,7 +92,7 @@ case "$OS" in
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="\\"

View File

@ -49,6 +49,12 @@ case "$OS" in
OS="Windows"
FS="\\"
;;
CYGWIN* )
PS=";"
OS="Windows"
FS="\\"
isCygwin=true
;;
* )
echo "Unrecognized system!"
exit 1;

View File

@ -46,5 +46,5 @@ $JAR -cf ${TESTCLASSES}/dummy.jar \
echo "Running test ..."
$JAVA -classpath \
${TESTCLASSES}${PS}${TESTCLASSES}/dummy.jar \
"${TESTCLASSES}${PS}${TESTCLASSES}/dummy.jar" \
ProviderTest

View File

@ -44,7 +44,7 @@ case "$OS" in
PS=":"
FS="/"
;;
Windows* )
Windows* | CYGWIN* )
PS=";"
FS="\\"
;;
@ -59,6 +59,6 @@ cd ${TESTCLASSES}
${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