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

[nmh] / test / whatnow / test-attach-detach

diff --git a/test/whatnow/test-attach-detach b/test/whatnow/test-attach-detach
index 7d538a2373c21dac7f11dddff75f895ded8c09cf..ba22a19c54235f10139e046608592422f9219687 100755 (executable)
--- a/test/whatnow/test-attach-detach
+++ b/test/whatnow/test-attach-detach
@@ -17,6 +17,9 @@ fi
 
 setup_test
 
 
 setup_test
 

+# Set TERM to get consistent output.
+TERM=dumb; export TERM
+

 cd "$MH_TEST_DIR"
 testname="baz's boz"
 testname_quoted="baz\'s\ boz"
 cd "$MH_TEST_DIR"
 testname="baz's boz"
 testname_quoted="baz\'s\ boz"


@@ -38,21 +41,23 @@ touch $expected $expectederr $actual $actualerr
 #
 
 set +e
 #
 
 set +e

-whatnowtest=`echo cd | TERM=dumb whatnow -prompt ''`
+whatnowtest=`echo cd | whatnow -prompt ''`

 set -e
 
 set -e
 

-case "${whatnowtest}" in
-    cd) cat > "$expected" <<EOF
+case ${whatnowtest} in
+    cd) cat >"$expected" <<EOF

 attach $testname_quoted
 alist
 $testname
 detach $testname_quoted
 alist
 EOF
 attach $testname_quoted
 alist
 $testname
 detach $testname_quoted
 alist
 EOF

+readline=1

     ;;
     ;;

-    "") cat > "$expected" <<EOF
+    "") cat >"$expected" <<EOF

 $testname
 EOF
 $testname
 EOF

+readline=0

     ;;
     *) echo "Unknown response to whatnow readline test"
     echo "Response is: ${whatnowtest}"
     ;;
     *) echo "Unknown response to whatnow readline test"
     echo "Response is: ${whatnowtest}"


@@ -63,18 +68,45 @@ esac
 # whatnow's exit status is always 1 so that is not a failure
 set +e
 echo "attach $testname_quoted" | \
 # whatnow's exit status is always 1 so that is not a failure
 set +e
 echo "attach $testname_quoted" | \

-  TERM=dumb whatnow -attach foo -noedit -prompt '' 2>> $actualerr >> $actual
-echo "alist" | TERM=dumb whatnow -attach foo -noedit -prompt '' \
-                               2>> $actualerr >> $actual
+  run_prog whatnow -noedit -prompt '' 2>>$actualerr >>$actual
+echo "alist" | \
+  run_prog whatnow -noedit -prompt '' 2>>$actualerr >>$actual

 echo "detach $testname_quoted" | \
 echo "detach $testname_quoted" | \

-  TERM=dumb whatnow -attach foo -noedit -prompt '' 2>> $actualerr >> $actual
-echo "alist" | TERM=dumb whatnow -attach foo -noedit -prompt '' \
-                               2>> $actualerr >> $actual
+  run_prog whatnow -noedit -prompt '' 2>>$actualerr >>$actual
+echo "alist" | \
+  run_prog whatnow -noedit -prompt '' 2>>$actualerr >>$actual

 set -e
 
 check "$expectederr" "$actualerr"
 check "$expected" "$actual"
 
 set -e
 
 check "$expectederr" "$actualerr"
 check "$expected" "$actual"
 

+if [ "$readline" = 0 ]; then
+cat >"$expected" <<EOF
+whatnow: attach command requires file argument(s).
+whatnow: attach command requires file argument(s).
+Attaching ${MH_TEST_DIR}/Mail/context as a text/plain
+EOF
+else
+cat >"$expected" <<EOF
+at
+whatnow: attach command requires file argument(s).
+at -v
+whatnow: attach command requires file argument(s).
+at -v Mail/context
+Attaching ${MH_TEST_DIR}/Mail/context as a text/plain
+quit -delete
+EOF
+fi
+
+printf '%s\n' \
+  'at' \
+  'at -v' \
+  'at -v Mail/context' \
+  'quit -delete' | whatnow -prompt '' 2>&1 | \
+  sed -e 's/; charset=us-ascii//' >"$actual"
+
+check "$expected" "$actual"
+

 test ${failed:-0} -eq 0  &&  rm "$testname"
 
 exit $failed
 test ${failed:-0} -eq 0  &&  rm "$testname"
 
 exit $failed