Fri, 17 Feb 2012 15:24:40 -0800
7143910: test/tools/apt/Basics/apt.sh fails with 'real' sh
Reviewed-by: darcy
Contributed-by: sonali.goel@oracle.com
test/tools/apt/Basics/apt.sh | file | annotate | diff | comparison | revisions |
1.1 --- a/test/tools/apt/Basics/apt.sh Tue Feb 14 15:43:52 2012 -0800 1.2 +++ b/test/tools/apt/Basics/apt.sh Fri Feb 17 15:24:40 2012 -0800 1.3 @@ -41,20 +41,10 @@ 1.4 esac 1.5 1.6 # Verify apt executable does not exist 1.7 -test -e "${TESTJAVA}/bin/apt" 1.8 - 1.9 -RESULT=$? 1.10 - 1.11 -case "${RESULT}" in 1.12 - 0 ) 1.13 - echo "apt executable should not exist." 1.14 - exit 1 1.15 - ;; 1.16 - 1.17 - * ) 1.18 - ;; 1.19 -esac 1.20 - 1.21 +if [ -f "${TESTJAVA}/bin/apt" -o -f "${TESTJAVA}/bin/apt.exe" ];then 1.22 + echo "apt executable should not exist." 1.23 + exit 1 1.24 +fi 1.25 1.26 # Construct path to javac executable 1.27 JAVAC="${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} -source 1.5 -sourcepath ${TESTSRC} -classpath ${TESTJAVA}/lib/tools.jar -d . "