archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 19:14: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

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

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