1.1 --- a/test/tools/javac/6302184/T6302184.sh Fri Aug 28 12:12:08 2009 -0700
1.2 +++ b/test/tools/javac/6302184/T6302184.sh Fri Aug 28 14:48:49 2009 -0700
1.3 @@ -42,13 +42,13 @@
1.4 OS=`uname -s`
1.5 case "$OS" in
1.6 SunOS | Linux )
1.7 - NULL=/dev/null
1.8 - PS=":"
1.9 FS="/"
1.10 ;;
1.11 + CYGWIN* )
1.12 + FS="/"
1.13 + DIFFOPTS="--strip-trailing-cr"
1.14 + ;;
1.15 Windows* )
1.16 - NULL=NUL
1.17 - PS=";"
1.18 FS="\\"
1.19 ;;
1.20 * )
1.21 @@ -57,8 +57,8 @@
1.22 ;;
1.23 esac
1.24
1.25 -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -cp ${TC} -encoding iso-8859-1 -XD-printsource ${TS}${FS}T6302184.java 2>&1 > ${NULL}
1.26 -diff -c ${TC}${FS}T6302184.java ${TS}${FS}T6302184.out
1.27 +"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -cp ${TC} -encoding iso-8859-1 -XD-printsource ${TS}${FS}T6302184.java 2>&1
1.28 +diff ${DIFFOPTS} -c ${TC}${FS}T6302184.java ${TS}${FS}T6302184.out
1.29 result=$?
1.30
1.31
