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

6876765: javah tests fail on Windows

Browse source 
Reviewed-by: darcy
This commit is contained in:
Jonathan Gibbons 2009-08-27 18:25:21 -07:00
parent 57102e24d4
commit 944568ba4b
4 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
langtools/test/tools/javah/6257087/foo.sh
View file

@ -42,12 +42,15 @@ fi
OS=`uname -s` OS=`uname -s`
case "$OS" in case "$OS" in
SunOS | Linux ) SunOS | Linux )
NULL=/dev/null
PS=":" PS=":"
FS="/" FS="/"
;; ;;
CYGWIN* )
PS=":"
FS="/"
DIFFOPTS="--strip-trailing-cr"
;;
Windows* ) Windows* )
NULL=NUL
PS=";" PS=";"
FS="\\" FS="\\"
;; ;;
@ -57,9 +60,9 @@ case "$OS" in
;; ;;
esac esac
"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d "${TC}" "${TS}${FS}foo.java" > ${NULL} "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d "${TC}" "${TS}${FS}foo.java"
"${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} -classpath "${TC}" -d "${TC}" foo "${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} -classpath "${TC}" -d "${TC}" foo
diff -c "${TS}${FS}foo_bar.h" "${TC}${FS}foo_bar.h" diff ${DIFFOPTS} -c "${TS}${FS}foo_bar.h" "${TC}${FS}foo_bar.h"
result=$? result=$?
if [ $result -eq 0 ] if [ $result -eq 0 ]

10
langtools/test/tools/javah/ConstMacroTest.sh
View file

@ -57,12 +57,16 @@ EXPECTED_JAVAH_OUT_FILE=SubClassConsts.out
OS=`uname -s` OS=`uname -s`
case "$OS" in case "$OS" in
SunOS | Linux ) SunOS | Linux )
NULL=/dev/null
PS=":" PS=":"
FS="/" FS="/"
;; ;;
CYGWIN* )
PS=":"
FS="/"
DIFFOPTS="--strip-trailing-cr"
EXPECTED_JAVAH_OUT_FILE=SubClassConsts.win
;;
Windows* ) Windows* )
NULL=NUL
PS=";" PS=";"
FS="\\" FS="\\"
EXPECTED_JAVAH_OUT_FILE=SubClassConsts.win EXPECTED_JAVAH_OUT_FILE=SubClassConsts.win
@ -85,7 +89,7 @@ cp "${TESTSRC}${FS}SubClassConsts.java" .
"${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} SubClassConsts "${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} SubClassConsts
cmp "${TESTSRC}${FS}${EXPECTED_JAVAH_OUT_FILE}" "${GENERATED_HEADER_FILE}" diff ${DIFFOPTS} "${TESTSRC}${FS}${EXPECTED_JAVAH_OUT_FILE}" "${GENERATED_HEADER_FILE}"
result=$? result=$?
rm ${GENERATED_HEADER_FILE} rm ${GENERATED_HEADER_FILE}

4
langtools/test/tools/javah/MissingParamClassTest.sh
View file

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

4
langtools/test/tools/javah/ReadOldClass.sh
View file

@ -43,13 +43,11 @@ fi
# set platform-dependent variables # set platform-dependent variables
OS=`uname -s` OS=`uname -s`
case "$OS" in case "$OS" in
SunOS | Linux ) SunOS | Linux | CYGWIN* )
NULL=/dev/null
PS=":" PS=":"
FS="/" FS="/"
;; ;;
Windows* ) Windows* )
NULL=NUL
PS=";" PS=";"
FS="\\" FS="\\"
;; ;;