Fix substitution code so it uses the right pointer for the utf-8 test.

[nmh] / test / whatnow / test-ls

diff --git a/test/whatnow/test-ls b/test/whatnow/test-ls
index 6509fd0a6485cc8fdc29069ef489cf15c6388f01..6f2bebca107226194b56ffa9fec50319ff1d564a 100755 (executable)
--- 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,10 +36,10 @@ 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
@@ -58,7 +61,17 @@ 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"