X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b47be5635d60ccd3fb5a3108c1cea170ce376df2..f4cd66d90b8c81816b0999027ff401ef15973f86:/test/whatnow/test-attach-detach

diff --git a/test/whatnow/test-attach-detach b/test/whatnow/test-attach-detach
index 15941025..a7b021f2 100755
--- 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} /home/levine/lib/src/nmh/test/testdir/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} /home/levine/lib/src/nmh/test/testdir/Mail/context
+#text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
 
-What now? #text/plain; charset=us-ascii; name="context" <> [context]{attachment} /home/levine/lib/src/nmh/test/testdir/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} /home/levine/lib/src/nmh/test/testdir/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 ] /home/levine/lib/src/nmh/test/testdir/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,39 @@ 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
+
+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' \
@@ -180,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 >"$actual" 2>&1
+'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"