1.1 --- a/test/tools/apt/Basics/apt.sh Thu Aug 27 17:39:16 2009 -0700
1.2 +++ b/test/tools/apt/Basics/apt.sh Thu Aug 27 17:50:21 2009 -0700
1.3 @@ -33,12 +33,11 @@
1.4
1.5 OS=`uname -s`;
1.6 case "${OS}" in
1.7 - Windows* | CYGWIN* )
1.8 - SEP=";"
1.9 + CYGWIN* )
1.10 + DIFFOPTS="--strip-trailing-cr"
1.11 ;;
1.12
1.13 * )
1.14 - SEP=":"
1.15 ;;
1.16 esac
1.17
1.18 @@ -94,7 +93,7 @@
1.19 do
1.20 printf "%s\n" "Testing annotations on source file ${i}"
1.21 ${APT} @options ${i} 2> result.txt
1.22 - diff ${TESTSRC}/golden.txt result.txt
1.23 + diff ${DIFFOPTS} ${TESTSRC}/golden.txt result.txt
1.24
1.25 RESULT=$?
1.26 case "$RESULT" in
1.27 @@ -109,7 +108,7 @@
1.28 CLASS=`basename ${i} .java`
1.29 printf "%s\n" "Testing annotations on class file ${CLASS}"
1.30 ${APT} @options1 ${CLASS} 2> result2.txt
1.31 - diff ${TESTSRC}/golden.txt result2.txt
1.32 + diff ${DIFFOPTS} ${TESTSRC}/golden.txt result2.txt
1.33
1.34 RESULT=$?
1.35 case "$RESULT" in
