X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/87e2eacc63f1ecc60d58a01921cdcf8b1aa55171..a69b69121b49e6de84d0e8bf0e39ba3a96b67188:/test/whatnow/test-ls

diff --git a/test/whatnow/test-ls b/test/whatnow/test-ls
index 9d072fa8..6f2bebca 100755
--- a/test/whatnow/test-ls
+++ b/test/whatnow/test-ls
@@ -17,6 +17,9 @@ fi
 
 setup_test
 
+# Set TERM to get consistent output.
+TERM=dumb; export TERM
+
 SPDIR="$MH_TEST_DIR/foo's bar"
 rm -rf "$SPDIR"
 mkdir "$SPDIR"
@@ -33,32 +36,42 @@ actual=$MH_TEST_DIR/$$.actual
 #
 
 set +e
-whatnowtest="$(echo cd | TERM=dumb whatnow -prompt '')"
+whatnowtest=`echo cd | whatnow -prompt ''`
 set -e
 
-case "${whatnowtest}" in
+case ${whatnowtest} in
     cd) cat > "$expected" <<EOF
 baz
 boz
 ls
 EOF
-    break;;
+    ;;
     "") cat > "$expected" <<EOF
 baz
 boz
 EOF
-    break;;
+    ;;
     *) echo "Unknown response to whatnow readline test"
     echo "Response is: ${whatnowtest}"
     exit 1
-    break;;
+    ;;
 esac
 
 cat > $expectederr <<EOF
 EOF
 
 # NB use of sort as the order of output of ls is not guaranteed
-echo 'ls' | TERM=dumb whatnow -noedit -prompt '' 2> "$actualerr" | \
+echo 'ls' | run_prog whatnow -noedit -prompt '' 2> "$actualerr" | \
+	sort > "$actual"
+
+check "$expectederr" "$actualerr" 'keep first'
+check "$expected" "$actual" 'keep first'
+
+# Check with SHELL unset.  This won't reveal any problems if
+# /bin/sh sets SHELL, which bash does.
+unset SHELL
+
+echo 'ls' | run_prog whatnow -noedit -prompt '' 2> "$actualerr" | \
 	sort > "$actual"
 
 check "$expectederr" "$actualerr"