Removed the tests of attach -v -a from test-attach-detach, and

added -prompt '' to try to get the test to pass on Mac OS X.

diff --git a/test/whatnow/test-attach-detach b/test/whatnow/test-attach-detach
index a7b021f2c28b5eff863124aa1a919bca7cfb7f74..3181f21b53deab3d60d22e77262e77b6346468b7 100755 (executable)
--- a/test/whatnow/test-attach-detach
+++ b/test/whatnow/test-attach-detach
@@ -82,122 +82,28 @@ check "$expected" "$actual"
 
 if [ "$readline" = 0 ]; then
 cat >"$expected" <<EOF
-
-What now? whatnow: attach command requires file argument(s).
-
-What now? whatnow: attach command requires file argument(s).
-
-What now? whatnow: ignoring attach -a without format argument.
 whatnow: attach command requires file argument(s).
-
-What now? whatnow: attach command requires file argument(s).
-
-What now? whatnow: ignoring attach -a without format argument.
 whatnow: attach command requires file argument(s).
-
-What now? whatnow: ignoring attach -a without format argument.
-whatnow: attach command requires file argument(s).
-
-What now? whatnow: attach command requires file argument(s).
-
-What now? 
-What now? whatnow: ignoring attach -a without format argument.
-#text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
-
-What now? whatnow: ingoring invalid attachformat value of 3
 #text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
-
-What now? #text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
-
-What now? #text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
-
-What now? #text/plain; name="context"; x-unix-mode=0600 [ ASCII text ] ${MH_TEST_DIR}/Mail/context
-
-What now? 
 EOF
 else
 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
+at
 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.
+at -v
 whatnow: attach command requires file argument(s).
-
-What now? at -a 0 -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; 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; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
-
-What now? at -v Mail/context
+at -v Mail/context
 #text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
-
-What now? at -v -a 1 Mail/context
-#text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
-
-What now? at -v -a 0 Mail/context
-#text/plain; name="context"; x-unix-mode=0600 [ ASCII text ] ${MH_TEST_DIR}/Mail/context
-
-What now? quit -delete
+quit -delete
 EOF
 fi
 
-# Don't depend on the mode of Mail/context:
-chmod 0600 ${MH_TEST_DIR}/Mail/context
-
-if [ "$readline" = 0 ]; then
-  #### Ensure that there will be a newline at the end whatnow's output.
-  whatnowtest () {
-    whatnow; echo
-  }
-else
-  whatnowtest () {
-    whatnow
-  }
-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' | whatnowtest 2>&1 | \
-  sed -e 's/; charset=us-ascii//' -e 's/ *ASCII text/ ASCII text/' \
-      -e 's/ *ascii text/ ASCII text/'  >"$actual"
-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"