X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6106441685a38400d9aa94ccb7218218102f941c..ae4ece224afb101116e61ac36bb913e7f11c5010:/test/whatnow/test-ls diff --git a/test/whatnow/test-ls b/test/whatnow/test-ls index 58ee2f61..f212e41e 100755 --- a/test/whatnow/test-ls +++ b/test/whatnow/test-ls @@ -6,15 +6,17 @@ # ###################################################### -if [ -z "${MH_TEST_COMMON}" ]; then - echo "MH_TEST_COMMON not set; try running via 'make check'" +set -e + +if test -z "${MH_OBJ_DIR}"; then + srcdir=`dirname "$0"`/../.. + MH_OBJ_DIR=`cd "$srcdir" && pwd`; export MH_OBJ_DIR fi -. ${MH_TEST_COMMON} +. "$MH_OBJ_DIR/test/common.sh" setup_test -set -e SPDIR="$MH_TEST_DIR/foo's bar" rm -rf "$SPDIR" mkdir "$SPDIR" @@ -37,5 +39,9 @@ EOF # NB use of sort as the order of output of ls is not guaranteed echo 'ls' | whatnow -noedit -prompt '' 2> "$actualerr" | sort > "$actual" -diff -u $expectederr $actualerr || exit 1 -diff -u $expected $actual +check "$expectederr" "$actualerr" +check "$expected" "$actual" + +test ${failed:-0} -eq 0 && rm -r "$SPDIR" + +exit $failed