Mercurial > jdk8-mips64-public > langtools / changeset

     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

     2.1 --- a/test/tools/apt/Basics/print.sh	Thu Aug 27 17:39:16 2009 -0700
     2.2 +++ b/test/tools/apt/Basics/print.sh	Thu Aug 27 17:50:21 2009 -0700
     2.3 @@ -32,12 +32,11 @@
     2.4  
     2.5  OS=`uname -s`;
     2.6  case "${OS}" in
     2.7 -        Windows* | CYGWIN* )
     2.8 -                SEP=";"
     2.9 +        CYGWIN* )
    2.10 +                DIFFOPTS="--strip-trailing-cr"
    2.11          ;;
    2.12  
    2.13  	* )
    2.14 -	SEP=":"
    2.15  	;;
    2.16  esac
    2.17  
    2.18 @@ -88,7 +87,7 @@
    2.19  # check for mutliple methods and no static initializer
    2.20  
    2.21  ${APT} -XclassesAsDecls -cp ${TESTCLASSES} -print Aggregate > aggregate.txt
    2.22 -diff aggregate.txt ${TESTSRC}/goldenAggregate.txt
    2.23 +diff ${DIFFOPTS} aggregate.txt ${TESTSRC}/goldenAggregate.txt
    2.24  
    2.25  RESULT=$?
    2.26  case "$RESULT" in

     3.1 --- a/test/tools/apt/Compile/compile.sh	Thu Aug 27 17:39:16 2009 -0700
     3.2 +++ b/test/tools/apt/Compile/compile.sh	Thu Aug 27 17:50:21 2009 -0700
     3.3 @@ -57,7 +57,12 @@
     3.4  
     3.5  OS=`uname -s`;
     3.6  case "${OS}" in
     3.7 -        Windows* | CYGWIN* )
     3.8 +        Windows* )
     3.9 +                SEP=";"
    3.10 +        ;;
    3.11 +
    3.12 +        CYGWIN* )
    3.13 +		DIFFOPTS="--strip-trailing-cr"
    3.14                  SEP=";"
    3.15          ;;
    3.16  
    3.17 @@ -150,7 +155,7 @@
    3.18  
    3.19  TestNoFile "HelloWorld.class"
    3.20  
    3.21 -diff output ${TESTSRC}/golden.txt
    3.22 +diff ${DIFFOPTS} output ${TESTSRC}/golden.txt
    3.23  
    3.24  RESULT=$?
    3.25  case "$RESULT" in
    3.26 @@ -180,7 +185,7 @@
    3.27  printf "%s\n" "HelloAnnotation.java"        >> options3
    3.28  ${APT} @options3 2> output
    3.29  
    3.30 -diff output ${TESTSRC}/goldenWarn.txt
    3.31 +diff ${DIFFOPTS} output ${TESTSRC}/goldenWarn.txt
    3.32  
    3.33  RESULT=$?
    3.34  case "$RESULT" in
    3.35 @@ -485,7 +490,7 @@
    3.36  printf "%s\n" "${TESTSRC}/Dummy1.java" >> options8
    3.37  ${APT} @options8 > multiRoundOutput 2> multiRoundError
    3.38  
    3.39 -diff multiRoundOutput  ${TESTSRC}/goldenFactory.txt
    3.40 +diff ${DIFFOPTS} multiRoundOutput  ${TESTSRC}/goldenFactory.txt
    3.41  
    3.42  RESULT=$?
    3.43  case "$RESULT" in