Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/test/tools/javac/4846262/Test.sh	Fri Aug 28 12:12:08 2009 -0700
     1.2 +++ b/test/tools/javac/4846262/Test.sh	Fri Aug 28 14:48:49 2009 -0700
     1.3 @@ -45,13 +45,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 @@ -68,7 +68,7 @@
    1.22  
    1.23  "${TESTJAVA}${FS}bin${FS}native2ascii" ${TESTTOOLVMOPTS} -encoding IBM1047 Test.tmp Test.out
    1.24  
    1.25 -diff -c "${TESTSRC}${FS}Test.out" Test.out
    1.26 +diff ${DIFFOPTS} -c "${TESTSRC}${FS}Test.out" Test.out
    1.27  result=$?
    1.28  
    1.29  if [ $result -eq o ]

     2.1 --- a/test/tools/javac/6302184/T6302184.sh	Fri Aug 28 12:12:08 2009 -0700
     2.2 +++ b/test/tools/javac/6302184/T6302184.sh	Fri Aug 28 14:48:49 2009 -0700
     2.3 @@ -42,13 +42,13 @@
     2.4  OS=`uname -s`
     2.5  case "$OS" in
     2.6    SunOS | Linux )
     2.7 -    NULL=/dev/null
     2.8 -    PS=":"
     2.9      FS="/"
    2.10      ;;
    2.11 +  CYGWIN* )
    2.12 +    FS="/"
    2.13 +    DIFFOPTS="--strip-trailing-cr"
    2.14 +    ;;
    2.15    Windows* )
    2.16 -    NULL=NUL
    2.17 -    PS=";"
    2.18      FS="\\"
    2.19      ;;
    2.20    * )
    2.21 @@ -57,8 +57,8 @@
    2.22      ;;
    2.23  esac
    2.24  
    2.25 -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -cp ${TC} -encoding iso-8859-1 -XD-printsource ${TS}${FS}T6302184.java 2>&1 > ${NULL}
    2.26 -diff -c ${TC}${FS}T6302184.java ${TS}${FS}T6302184.out
    2.27 +"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -cp ${TC} -encoding iso-8859-1 -XD-printsource ${TS}${FS}T6302184.java 2>&1
    2.28 +diff ${DIFFOPTS} -c ${TC}${FS}T6302184.java ${TS}${FS}T6302184.out
    2.29  result=$?
    2.30  
    2.31  

     3.1 --- a/test/tools/javac/ClassPathTest/ClassPathTest.sh	Fri Aug 28 12:12:08 2009 -0700
     3.2 +++ b/test/tools/javac/ClassPathTest/ClassPathTest.sh	Fri Aug 28 14:48:49 2009 -0700
     3.3 @@ -56,14 +56,10 @@
     3.4  # set platform-dependent variables
     3.5  OS=`uname -s`
     3.6  case "$OS" in
     3.7 -  SunOS | Linux )
     3.8 -    NULL=/dev/null
     3.9 -    PS=":"
    3.10 +  SunOS | Linux | CYGWIN* )
    3.11      FS="/"
    3.12      ;;
    3.13    Windows* )
    3.14 -    NULL=NUL
    3.15 -    PS=";"
    3.16      FS="\\"
    3.17      ;;
    3.18    * )

     4.1 --- a/test/tools/javac/ExtDirs/ExtDirs.sh	Fri Aug 28 12:12:08 2009 -0700
     4.2 +++ b/test/tools/javac/ExtDirs/ExtDirs.sh	Fri Aug 28 14:48:49 2009 -0700
     4.3 @@ -55,12 +55,14 @@
     4.4  OS=`uname -s`
     4.5  case "$OS" in
     4.6    SunOS | Linux )
     4.7 -    NULL=/dev/null
     4.8      PS=":"
     4.9      FS="/"
    4.10      ;;
    4.11 +  CYGWIN* )
    4.12 +    PS=";" # native PS, not Cygwin PS
    4.13 +    FS="/"
    4.14 +    ;;
    4.15    Windows* )
    4.16 -    NULL=NUL
    4.17      PS=";"
    4.18      FS="\\"
    4.19      ;;

     5.1 --- a/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Fri Aug 28 12:12:08 2009 -0700
     5.2 +++ b/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Fri Aug 28 14:48:49 2009 -0700
     5.3 @@ -53,12 +53,14 @@
     5.4  OS=`uname -s`
     5.5  case "$OS" in
     5.6    SunOS | Linux )
     5.7 -    NULL=/dev/null
     5.8      PS=":"
     5.9      FS="/"
    5.10      ;;
    5.11 +  CYGWIN* ) 
    5.12 +    PS=";" # native PS, not Cygwin PS
    5.13 +    FS="/"
    5.14 +    ;;
    5.15    Windows* )
    5.16 -    NULL=NUL
    5.17      PS=";"
    5.18      FS="\\"
    5.19      ;;

     6.1 --- a/test/tools/javac/javazip/Test.sh	Fri Aug 28 12:12:08 2009 -0700
     6.2 +++ b/test/tools/javac/javazip/Test.sh	Fri Aug 28 14:48:49 2009 -0700
     6.3 @@ -42,14 +42,16 @@
     6.4  OS=`uname -s`
     6.5  case "$OS" in
     6.6    SunOS | Linux )
     6.7 -    NULL=/dev/null
     6.8 -    PS=":"
     6.9      FS="/"
    6.10 +    SCR=`pwd`
    6.11 +    ;;
    6.12 +  CYGWIN* )
    6.13 +    FS="/"
    6.14 +    SCR=`pwd | cygpath -d`
    6.15      ;;
    6.16    Windows* )
    6.17 -    NULL=NUL
    6.18 -    PS=";"
    6.19      FS="\\"
    6.20 +    SCR=`pwd`
    6.21      ;;
    6.22    * )
    6.23      echo "Unrecognized system!"

     7.1 --- a/test/tools/javac/newlines/Newlines.sh	Fri Aug 28 12:12:08 2009 -0700
     7.2 +++ b/test/tools/javac/newlines/Newlines.sh	Fri Aug 28 14:48:49 2009 -0700
     7.3 @@ -50,14 +50,10 @@
     7.4  # set platform-dependent variables
     7.5  OS=`uname -s`
     7.6  case "$OS" in
     7.7 -  SunOS | Linux )
     7.8 -    NULL=/dev/null
     7.9 -    PS=":"
    7.10 +  SunOS | Linux | CYGWIN* )
    7.11      FS="/"
    7.12      ;;
    7.13    Windows* )
    7.14 -    NULL=NUL
    7.15 -    PS=";"
    7.16      FS="\\"
    7.17      ;;
    7.18    * )

     8.1 --- a/test/tools/javac/unicode/SupplementaryJavaID6.sh	Fri Aug 28 12:12:08 2009 -0700
     8.2 +++ b/test/tools/javac/unicode/SupplementaryJavaID6.sh	Fri Aug 28 14:48:49 2009 -0700
     8.3 @@ -75,6 +75,11 @@
     8.4      PS=";"
     8.5      FS="\\"
     8.6      ;;
     8.7 +  CYGWIN* )
     8.8 +    ENV=""
     8.9 +    PS=";" # platform PS, not cygwin PS
    8.10 +    FS="/"
    8.11 +    ;;
    8.12    * )
    8.13      echo "Unrecognized system!"
    8.14      exit 1;