Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/test/tools/javac/fatalErrors/NoJavaLang.sh	Fri Aug 28 16:54:10 2009 -0700
     1.2 +++ b/test/tools/javac/fatalErrors/NoJavaLang.sh	Mon Aug 31 12:36:26 2009 -0700
     1.3 @@ -49,13 +49,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 @@ -98,7 +98,7 @@
    1.22  
    1.23  # expected message
    1.24  cat "${TMP1}"
    1.25 -diff -c "${TESTSRC}${FS}NoJavaLang.out" "${TMP1}"
    1.26 +diff ${DIFFOPTS} -c "${TESTSRC}${FS}NoJavaLang.out" "${TMP1}"
    1.27  result=$?
    1.28  rm "${TMP1}"
    1.29