X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c6bf562d9e823f02fb4a9e6dfb89bf93a0e9d0ab..605516b7c2e68efcd681478d40b210e6af968d58:/test/whatnow/test-ls

diff --git a/test/whatnow/test-ls b/test/whatnow/test-ls
index f212e41e..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"
@@ -28,20 +31,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 | 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' | 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"
 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