Replace `(char *)0' et al with `NULL'.

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

diff --git a/test/whatnow/test-attach-detach b/test/whatnow/test-attach-detach
index 5c359decfe9ccdfe54af5217a7029a839ec83f44..ba22a19c54235f10139e046608592422f9219687 100755 (executable)
--- a/test/whatnow/test-attach-detach
+++ b/test/whatnow/test-attach-detach
@@ -6,20 +6,24 @@
 #
 ######################################################
 
 #
 ######################################################
 

+set -e
+

 if test -z "${MH_OBJ_DIR}"; then
 if test -z "${MH_OBJ_DIR}"; then

-    srcdir=`dirname $0`/../..
-    MH_OBJ_DIR=`cd $srcdir && pwd`; export MH_OBJ_DIR
+    srcdir=`dirname "$0"`/../..
+    MH_OBJ_DIR=`cd "$srcdir" && pwd`; export MH_OBJ_DIR

 fi
 
 . "$MH_OBJ_DIR/test/common.sh"
 
 setup_test
 
 fi
 
 . "$MH_OBJ_DIR/test/common.sh"
 
 setup_test
 

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

 
 cd "$MH_TEST_DIR"
 
 cd "$MH_TEST_DIR"

-rm -f "baz's boz"
-touch "baz's boz"
+testname="baz's boz"
+testname_quoted="baz\'s\ boz"
+touch "$testname"

 # whatnow's attach stuff needs a draft to work on
 cp "$MH_TEST_DIR/Mail/inbox/1" "$MH_TEST_DIR/Mail/draft"
 
 # whatnow's attach stuff needs a draft to work on
 cp "$MH_TEST_DIR/Mail/inbox/1" "$MH_TEST_DIR/Mail/draft"
 


@@ -31,17 +35,78 @@ actual=$MH_TEST_DIR/$$.actual
 rm -f $expected $expectederr $actual $actualerr
 touch $expected $expectederr $actual $actualerr
 
 rm -f $expected $expectederr $actual $actualerr
 touch $expected $expectederr $actual $actualerr
 

-cat > $expected <<EOF
-baz's boz
+#
+# Sigh.  Different readline versions change echoing behavior, so we need
+# to deal.
+#
+
+set +e
+whatnowtest=`echo cd | whatnow -prompt ''`
+set -e
+
+case ${whatnowtest} in
+    cd) cat >"$expected" <<EOF
+attach $testname_quoted
+alist
+$testname
+detach $testname_quoted
+alist

 EOF
 EOF

+readline=1
+    ;;
+    "") cat >"$expected" <<EOF
+$testname
+EOF
+readline=0
+    ;;
+    *) echo "Unknown response to whatnow readline test"
+    echo "Response is: ${whatnowtest}"
+    exit 1
+    ;;
+esac

 
 # whatnow's exit status is always 1 so that is not a failure
 set +e
 
 # whatnow's exit status is always 1 so that is not a failure
 set +e

-echo "attach baz\\'s\\ boz" | whatnow -attach foo -noedit -prompt '' 2>> $actualerr >> $actual
-echo "alist" | whatnow -attach foo -noedit -prompt '' 2>> $actualerr >> $actual
-echo "detach baz\\'s\\ boz" | whatnow -attach foo -noedit -prompt '' 2>> $actualerr >> $actual
-echo "alist" | whatnow -attach foo -noedit -prompt '' 2>> $actualerr >> $actual
+echo "attach $testname_quoted" | \
+  run_prog whatnow -noedit -prompt '' 2>>$actualerr >>$actual
+echo "alist" | \
+  run_prog whatnow -noedit -prompt '' 2>>$actualerr >>$actual
+echo "detach $testname_quoted" | \
+  run_prog whatnow -noedit -prompt '' 2>>$actualerr >>$actual
+echo "alist" | \
+  run_prog whatnow -noedit -prompt '' 2>>$actualerr >>$actual

 set -e
 
 set -e
 

-diff -u $expectederr $actualerr || exit 1
-diff -u $expected $actual
+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