archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 02:54:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6877188: some javac shell tests do not work on Windows

Browse source 
Reviewed-by: darcy
This commit is contained in:
Jonathan Gibbons 2009-08-28 14:48:49 -07:00
parent e4158efc0e
commit 45e9a3c1e9
8 changed files with 32 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

10
langtools/test/tools/javac/4846262/Test.sh
View file

@ -45,13 +45,13 @@ fi
OS=`uname -s`
case "$OS" in
SunOS | Linux )
NULL=/dev/null
PS=":"
FS="/"
;;
CYGWIN* )
FS="/"
DIFFOPTS="--strip-trailing-cr"
;;
Windows* )
NULL=NUL
PS=";"
FS="\\"
;;
* )
@ -68,7 +68,7 @@ rm -f Test.java Test.out
"${TESTJAVA}${FS}bin${FS}native2ascii" ${TESTTOOLVMOPTS} -encoding IBM1047 Test.tmp Test.out
diff -c "${TESTSRC}${FS}Test.out" Test.out
diff ${DIFFOPTS} -c "${TESTSRC}${FS}Test.out" Test.out
result=$?
if [ $result -eq o ]

12
langtools/test/tools/javac/6302184/T6302184.sh
View file

@ -42,13 +42,13 @@ fi
OS=`uname -s`
case "$OS" in
SunOS | Linux )
NULL=/dev/null
PS=":"
FS="/"
;;
CYGWIN* )
FS="/"
DIFFOPTS="--strip-trailing-cr"
;;
Windows* )
NULL=NUL
PS=";"
FS="\\"
;;
* )
@ -57,8 +57,8 @@ case "$OS" in
;;
esac
"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -cp ${TC} -encoding iso-8859-1 -XD-printsource ${TS}${FS}T6302184.java 2>&1 > ${NULL}
diff -c ${TC}${FS}T6302184.java ${TS}${FS}T6302184.out
"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -cp ${TC} -encoding iso-8859-1 -XD-printsource ${TS}${FS}T6302184.java 2>&1
diff ${DIFFOPTS} -c ${TC}${FS}T6302184.java ${TS}${FS}T6302184.out
result=$?

6
langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh
View file

@ -56,14 +56,10 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux )
NULL=/dev/null
PS=":"
SunOS | Linux | CYGWIN* )
FS="/"
;;
Windows* )
NULL=NUL
PS=";"
FS="\\"
;;
* )

6
langtools/test/tools/javac/ExtDirs/ExtDirs.sh
View file

@ -55,12 +55,14 @@ echo "CLASSPATH=${CLASSPATH}"
OS=`uname -s`
case "$OS" in
SunOS | Linux )
NULL=/dev/null
PS=":"
FS="/"
;;
CYGWIN* )
PS=";" # native PS, not Cygwin PS
FS="/"
;;
Windows* )
NULL=NUL
PS=";"
FS="\\"
;;

6
langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh
View file

@ -53,12 +53,14 @@ echo "CLASSPATH=${CLASSPATH}"
OS=`uname -s`
case "$OS" in
SunOS | Linux )
NULL=/dev/null
PS=":"
FS="/"
;;
CYGWIN* )
PS=";" # native PS, not Cygwin PS
FS="/"
;;
Windows* )
NULL=NUL
PS=";"
FS="\\"
;;

10
langtools/test/tools/javac/javazip/Test.sh
View file

@ -42,14 +42,16 @@ fi
OS=`uname -s`
case "$OS" in
SunOS | Linux )
NULL=/dev/null
PS=":"
FS="/"
SCR=`pwd`
;;
CYGWIN* )
FS="/"
SCR=`pwd | cygpath -d`
;;
Windows* )
NULL=NUL
PS=";"
FS="\\"
SCR=`pwd`
;;
* )
echo "Unrecognized system!"

6
langtools/test/tools/javac/newlines/Newlines.sh
View file

@ -50,14 +50,10 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux )
NULL=/dev/null
PS=":"
SunOS | Linux | CYGWIN* )
FS="/"
;;
Windows* )
NULL=NUL
PS=";"
FS="\\"
;;
* )

5
langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh
View file

@ -75,6 +75,11 @@ case "$OS" in
PS=";"
FS="\\"
;;
CYGWIN* )
ENV=""
PS=";" # platform PS, not cygwin PS
FS="/"
;;
* )
echo "Unrecognized system!"
exit 1;