Better fix for test-attach-detach on platforms without readline.

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

diff --git a/test/whatnow/test-attach-detach b/test/whatnow/test-attach-detach
index c7b717f8ed10c550d73382e5349e1ecdf3e0eb64..a7b021f2c28b5eff863124aa1a919bca7cfb7f74 100755 (executable)
--- a/test/whatnow/test-attach-detach
+++ b/test/whatnow/test-attach-detach
@@ -111,7 +111,7 @@ What now? #text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Ma
 
 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? #text/plain; name="context"; x-unix-mode=0600 [ ASCII text ] ${MH_TEST_DIR}/Mail/context
 
 What now? 
 EOF
@@ -159,7 +159,7 @@ 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
+#text/plain; name="context"; x-unix-mode=0600 [ ASCII text ] ${MH_TEST_DIR}/Mail/context
 
 What now? quit -delete
 EOF
@@ -168,6 +168,17 @@ 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' \
@@ -183,12 +194,11 @@ printf '%s\n' \
 'at -v Mail/context' \
 'at -v -a 1 Mail/context' \
 'at -v -a 0 Mail/context' \
-'quit -delete' | whatnow 2>&1 | sed -e 's/; charset=us-ascii//' >"$actual"
+'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
 
-#### Without readline, need to add trailing newline.
-[ "$readline" = 0 ] && printf '\n' >>"$actual"
-
 check "$expected" "$actual"
 
 test ${failed:-0} -eq 0  &&  rm "$testname"