# HG changeset patch # User darcy # Date 1329521080 28800 # Node ID d659025e65750cd7a8572ba051763e7df9ecb27c # Parent 35f55dadfe888c5d2f0e13fbfe5762fcaae87ddf 7143910: test/tools/apt/Basics/apt.sh fails with 'real' sh Reviewed-by: darcy Contributed-by: sonali.goel@oracle.com diff -r 35f55dadfe88 -r d659025e6575 langtools/test/tools/apt/Basics/apt.sh --- a/langtools/test/tools/apt/Basics/apt.sh Tue Feb 14 15:43:52 2012 -0800 +++ b/langtools/test/tools/apt/Basics/apt.sh Fri Feb 17 15:24:40 2012 -0800 @@ -41,20 +41,10 @@ esac # Verify apt executable does not exist -test -e "${TESTJAVA}/bin/apt" - -RESULT=$? - -case "${RESULT}" in - 0 ) - echo "apt executable should not exist." - exit 1 - ;; - - * ) - ;; -esac - +if [ -f "${TESTJAVA}/bin/apt" -o -f "${TESTJAVA}/bin/apt.exe" ];then + echo "apt executable should not exist." + exit 1 +fi # Construct path to javac executable JAVAC="${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} -source 1.5 -sourcepath ${TESTSRC} -classpath ${TESTJAVA}/lib/tools.jar -d . "