1.1 --- a/test/tools/javac/constDebug/ConstDebug.sh Fri Aug 28 16:54:10 2009 -0700 1.2 +++ b/test/tools/javac/constDebug/ConstDebug.sh Mon Aug 31 12:36:26 2009 -0700 1.3 @@ -48,12 +48,14 @@ 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 + PS=";" # Platform PS, not Cygwin PS 1.13 + FS="/" 1.14 + ;; 1.15 Windows* ) 1.16 - NULL=NUL 1.17 PS=";" 1.18 FS="\\" 1.19 ;; 1.20 @@ -69,7 +71,7 @@ 1.21 "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -g -d . -classpath .${PS}${TESTSRC} $1.java 2> ${TMP1} 1.22 result=$? 1.23 if [ $result -ne 0 ]; then exit $result; fi 1.24 -if strings $1.class | grep clinit; then 1.25 +if "${TESTJAVA}${FS}bin${FS}javap" $1.class | grep clinit; then 1.26 echo "Failed" 1.27 exit 1; 1.28 else