projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document formatarg.
[mmh]
/
test
/
whatnow
/
test-ls
diff --git
a/test/whatnow/test-ls
b/test/whatnow/test-ls
index
58ee2f6
..
c289830
100755
(executable)
--- 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
fi
-. ${MH_TEST_COMMON}
+. "$MH_OBJ_DIR/test/common.sh"
setup_test
setup_test
-set -e
SPDIR="$MH_TEST_DIR/foo's bar"
rm -rf "$SPDIR"
mkdir "$SPDIR"
SPDIR="$MH_TEST_DIR/foo's bar"
rm -rf "$SPDIR"
mkdir "$SPDIR"
@@
-37,5
+39,11
@@
EOF
# NB use of sort as the order of output of ls is not guaranteed
echo 'ls' | whatnow -noedit -prompt '' 2> "$actualerr" | sort > "$actual"
# 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"
+
+# On some platforms, need to be out of $SPDIR in order to remove it.
+cd "$MH_TEST_DIR"
+test ${failed:-0} -eq 0 && rm -r "$SPDIR"
+
+exit $failed