X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c7aa48718fa2040788a757082e2c3d49b6f42fe7..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/test/prompter/test-prompter

diff --git a/test/prompter/test-prompter b/test/prompter/test-prompter
index 03f2f130..1950903c 100755
--- a/test/prompter/test-prompter
+++ b/test/prompter/test-prompter
@@ -35,14 +35,15 @@ Usage: prompter [switches] file
   -help
 EOF
 
-prompter -help >$actual 2>&1
-check $expected $actual
+#### Skip nmh intro text.
+run_prog prompter -help | sed '/^$/,$d' >"$actual" 2>&1
+check "$expected" "$actual"
 
 # check -version
 case `prompter -v` in
   prompter\ --*) ;;
-  *           ) printf "$0: prompter -v generated unexpected output\n" >&2
-                failed=`expr ${failed:-0} + 1`;;
+  *            ) printf '%s: prompter -v generated unexpected output\n' "$0" >&2
+                 failed=`expr ${failed:-0} + 1`;;
 esac
 
 # check unknown switch
@@ -70,7 +71,7 @@ Resent-fcc:
 EOF
 
 printf 'recipient@example.com\ncc@example.com\n+outbox\nmessage body\n' | \
-  prompter $MH_TEST_DIR/prompter-file > /dev/null
+  run_prog prompter $MH_TEST_DIR/prompter-file >/dev/null
 
 check "$expected" "$MH_TEST_DIR/prompter-file" 'keep first'
 
@@ -83,7 +84,7 @@ Resent-fcc:
 EOF
 
 printf 'recipient@example.com\ncc@example.com\n+outbox\nmessage body\n.\n' | \
-  prompter -doteof $MH_TEST_DIR/prompter-file > /dev/null
+  run_prog prompter -doteof $MH_TEST_DIR/prompter-file >/dev/null
 
 check "$expected" "$MH_TEST_DIR/prompter-file" 'keep first'
 
@@ -96,7 +97,7 @@ Resent-fcc:
 EOF
 
 printf 'recipient@example.com\ncc@example.com\n+outbox\nmessage body\n' | \
-  prompter -doteof -nodoteof $MH_TEST_DIR/prompter-file > /dev/null
+  run_prog prompter -doteof -nodoteof $MH_TEST_DIR/prompter-file >/dev/null
 
 check "$expected" "$MH_TEST_DIR/prompter-file" 'keep first'
 
@@ -110,10 +111,10 @@ Resent-fcc:
 message body
 EOF
 
-printf 'appendage\n' >> "$expected"
+printf 'appendage\n' >>"$expected"
 
 printf 'recipient@example.com\ncc@example.com\n+outbox\nappendage\n' | \
-  prompter -noprepend $MH_TEST_DIR/prompter-file > /dev/null
+  run_prog prompter -noprepend $MH_TEST_DIR/prompter-file >/dev/null
 
 check "$expected" "$MH_TEST_DIR/prompter-file"
 
@@ -138,7 +139,7 @@ message body
 EOF
 
 printf 'recipient@example.com\ncc@example.com\n+outbox\nprependage\n' | \
-  prompter -noprepend -prepend $MH_TEST_DIR/prompter-file > /dev/null
+  run_prog prompter -noprepend -prepend $MH_TEST_DIR/prompter-file >/dev/null
 
 check "$MH_TEST_DIR/prompter-file" "$expected" 'keep first'
 
@@ -154,7 +155,7 @@ Resent-fcc: +outbox
 --------
 EOF
 
-prompter -rapid $MH_TEST_DIR/prompter-file > "$actual" < /dev/null
+run_prog prompter -rapid $MH_TEST_DIR/prompter-file >"$actual" </dev/null
 
 check "$expected" "$actual"
 
@@ -172,7 +173,8 @@ message body
 --------
 EOF
 
-prompter -rapid -norapid $MH_TEST_DIR/prompter-file > "$actual" < /dev/null
+run_prog prompter -rapid -norapid $MH_TEST_DIR/prompter-file \
+  >"$actual" </dev/null
 
 check "$expected" "$actual"
 
@@ -195,7 +197,7 @@ message body
 EOF
 
 printf 'woot woot\n' | \
-  prompter -erase '' -kill '' $MH_TEST_DIR/prompter-file > "$actual"
+  run_prog prompter -erase '' -kill '' $MH_TEST_DIR/prompter-file >"$actual"
 
 check "$expected" "$actual"
 
@@ -215,7 +217,8 @@ message body
 --------
 EOF
 
-prompter -nobody -body $MH_TEST_DIR/prompter-file > "$actual" < /dev/null
+run_prog prompter -nobody -body $MH_TEST_DIR/prompter-file >"$actual" \
+  </dev/null
 
 check "$expected" "$actual"
 
@@ -227,7 +230,7 @@ Resent-cc: cc@example.com
 Resent-fcc: +outbox
 EOF
 
-prompter -nobody $MH_TEST_DIR/prompter-file > /dev/null
+run_prog prompter -nobody $MH_TEST_DIR/prompter-file >/dev/null
 
 check "$expected" "$MH_TEST_DIR/prompter-file"