X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fwhatnow%2Ftest-ls;h=f212e41e49f28f0d69372291c041cff1a6d52e55;hb=ab719ef6625da100f92aa8c2d6f8ae6ea7bae2cb;hp=58ee2f61fba0b18abed88d3db9a32f8678084250;hpb=6106441685a38400d9aa94ccb7218218102f941c;p=mmh

diff --git a/test/whatnow/test-ls b/test/whatnow/test-ls
index 58ee2f6..f212e41 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