Hacked test-attach-detach to pass on Solaris.

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

diff --git a/test/whatnow/test-attach-detach b/test/whatnow/test-attach-detach
index 15641f47030cfaff7d9e44b499c7f875a9812040..84b0487ba2e13f12fdfffd98dbc8e0627cc7e4d2 100755 (executable)
--- a/test/whatnow/test-attach-detach
+++ b/test/whatnow/test-attach-detach
@@ -102,16 +102,16 @@ What now? whatnow: attach command requires file argument(s).
 
 What now? 
 What now? whatnow: ignoring attach -a without format argument.
-#text/plain; charset=us-ascii; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
+#text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
 
 What now? whatnow: ingoring invalid attachformat value of 3
-#text/plain; charset=us-ascii; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
+#text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
 
-What now? #text/plain; charset=us-ascii; 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; charset=us-ascii; 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; charset=us-ascii; name="context"; x-unix-mode=0600 [  ASCII text ] ${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
@@ -146,25 +146,28 @@ 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
+#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; charset=us-ascii; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
+#text/plain; 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
+#text/plain; 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
+#text/plain; 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=0600 [  ASCII text ] ${MH_TEST_DIR}/Mail/context
+#text/plain; name="context"; x-unix-mode=0600 [ ASCII text ] ${MH_TEST_DIR}/Mail/context
 
 What now? quit -delete
 EOF
 fi
 
+# Don't depend on the mode of Mail/context:
+chmod 0600 ${MH_TEST_DIR}/Mail/context
+
 set +e
 printf '%s\n' \
 'at' \
@@ -180,11 +183,18 @@ printf '%s\n' \
 'at -v Mail/context' \
 'at -v -a 1 Mail/context' \
 'at -v -a 0 Mail/context' \
-'quit -delete' | whatnow >"$actual" 2>&1
+'quit -delete' | whatnow 2>&1 | \
+  sed -e 's/; charset=us-ascii//' -e 's/ *ASCII text/ ASCII text/' \
+      -e 's/ *ascii text/ ASCII text/'  >"$actual"
 set -e
 
-#### Without readline, need to add trailing newline.
-[ "$readline" = 0 ] && printf '\n' >>"$actual"
+#### Without readline, need to add trailing newline.  And the final
+#### prompt that might have been lost.
+if [ "$readline" = 0 ]; then
+  printf '\n' >>"$actual"
+  sed -e '32,32s/^$/What now? /' "$actual" >"$actual.tmp"
+  mv "$actual.tmp" "$actual"
+fi
 
 check "$expected" "$actual"