Remove WHATNOW #ifdefs; that code was obsolete a long time ago.

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

diff --git a/test/whatnow/test-attach-detach b/test/whatnow/test-attach-detach
index f674a4f5b95a6477bc7e337572a183d547fee0ff..3181f21b53deab3d60d22e77262e77b6346468b7 100755 (executable)
--- a/test/whatnow/test-attach-detach
+++ b/test/whatnow/test-attach-detach
@@ -52,10 +52,12 @@ $testname
 detach $testname_quoted
 alist
 EOF
+readline=1
     ;;
     "") cat >"$expected" <<EOF
 $testname
 EOF
+readline=0
     ;;
     *) echo "Unknown response to whatnow readline test"
     echo "Response is: ${whatnowtest}"
@@ -78,71 +80,30 @@ set -e
 check "$expectederr" "$actualerr"
 check "$expected" "$actual"
 
+if [ "$readline" = 0 ]; then
 cat >"$expected" <<EOF
-
-What now? at
-whatnow: attach command requires file argument(s).
-
-What now? at -v
 whatnow: attach command requires file argument(s).
-
-What now? at -v -a
-whatnow: ignoring attach -a without format argument.
-whatnow: attach command requires file argument(s).
-
-What now? at -v -a 0
 whatnow: attach command requires file argument(s).
-
-What now? at -a
-whatnow: ignoring attach -a without format argument.
-whatnow: attach command requires file argument(s).
-
-What now? at -a -v
-whatnow: ignoring attach -a without format argument.
+#text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
+EOF
+else
+cat >"$expected" <<EOF
+at
 whatnow: attach command requires file argument(s).
-
-What now? at -a 0 -v
+at -v
 whatnow: attach command requires file argument(s).
-
-What now? at -a 0 Mail/context
-
-What now? at -v -a Mail/context
-whatnow: ignoring attach -a without format argument.
-#text/plain; charset=us-ascii; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
-
-What now? at -v -a 3 Mail/context
-whatnow: ingoring invalid attachformat value of 3
-#text/plain; charset=us-ascii; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
-
-What now? at -v Mail/context
-#text/plain; charset=us-ascii; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
-
-What now? at -v -a 1 Mail/context
-#text/plain; charset=us-ascii; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
-
-What now? at -v -a 0 Mail/context
-#text/plain; charset=us-ascii; name="context"; x-unix-mode=0644 [  ASCII text ] ${MH_TEST_DIR}/Mail/context
-
-What now? quit -delete
+at -v Mail/context
+#text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
+quit -delete
 EOF
+fi
 
-set +e
 printf '%s\n' \
-'at' \
-'at -v' \
-'at -v -a' \
-'at -v -a 0' \
-'at -a' \
-'at -a -v' \
-'at -a 0 -v' \
-'at -a 0 Mail/context' \
-'at -v -a Mail/context' \
-'at -v -a 3 Mail/context' \
-'at -v Mail/context' \
-'at -v -a 1 Mail/context' \
-'at -v -a 0 Mail/context' \
-'quit -delete' | whatnow >$actual 2>&1
-set -e
+  'at' \
+  'at -v' \
+  'at -v Mail/context' \
+  'quit -delete' | whatnow -prompt '' 2>&1 | \
+  sed -e 's/; charset=us-ascii//' >"$actual"
 
 check "$expected" "$actual"