X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fwhatnow%2Ftest-ls;h=7a1b77a39fe97c14a96899567bdbbd7cd273fca7;hb=987fadb3bd0a40e55ba4e228dc0ef4269893a2ad;hp=e3571ac913adda3225b4311cfa97a2fbf86c51de;hpb=e107aac243dbd4021e57f4c455c7e3ffd82b819e;p=mmh

diff --git a/test/whatnow/test-ls b/test/whatnow/test-ls
index e3571ac..7a1b77a 100755
--- a/test/whatnow/test-ls
+++ b/test/whatnow/test-ls
@@ -6,6 +6,8 @@
 #
 ######################################################
 
+set -e
+
 if test -z "${MH_OBJ_DIR}"; then
     srcdir=`dirname "$0"`/../..
     MH_OBJ_DIR=`cd "$srcdir" && pwd`; export MH_OBJ_DIR
@@ -15,7 +17,6 @@ fi
 
 setup_test
 
-set -e
 SPDIR="$MH_TEST_DIR/foo's bar"
 rm -rf "$SPDIR"
 mkdir "$SPDIR"
@@ -27,16 +28,54 @@ actualerr=$MH_TEST_DIR/$$.actualerr
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
 
-cat > $expected <<EOF
+#
+# Handle different output depending on readline version
+#
+
+set +e
+whatnowtest=`echo cd | TERM=dumb whatnow -prompt ''`
+set -e
+
+case "${whatnowtest}" in
+    cd) cat > "$expected" <<EOF
 baz
 boz
+ls
 EOF
+    ;;
+    "") cat > "$expected" <<EOF
+baz
+boz
+EOF
+    ;;
+    *) echo "Unknown response to whatnow readline test"
+    echo "Response is: ${whatnowtest}"
+    exit 1
+    ;;
+esac
 
 cat > $expectederr <<EOF
 EOF
 
 # NB use of sort as the order of output of ls is not guaranteed
-echo 'ls' | whatnow -noedit -prompt '' 2> "$actualerr" | sort > "$actual"
+echo 'ls' | TERM=dumb whatnow -noedit -prompt '' 2> "$actualerr" | \
+	sort > "$actual"
+
+check "$expectederr" "$actualerr" 'keep first'
+check "$expected" "$actual" 'keep first'
+
+# Check with SHELL unset.  system () on Linux (glibc) seems to
+# always use /bin/sh, so this test won't reveal anything with it.
+unset SHELL
+
+echo 'ls' | TERM=dumb whatnow -noedit -prompt '' 2> "$actualerr" | \
+	sort > "$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"
 
-diff -u $expectederr $actualerr || exit 1
-diff -u $expected $actual
+exit $failed