mhfixmsg.c: Flip logic to simplify. Remove else after break.

[nmh] / test / post / test-post-aliases

diff --git a/test/post/test-post-aliases b/test/post/test-post-aliases
index 6030ad13e0d3f33edde8ead36926190043225787..664346df6b6af1afcadc031596bbb76fc5654429 100755 (executable)
--- a/test/post/test-post-aliases
+++ b/test/post/test-post-aliases
@@ -27,7 +27,7 @@ EOF
 #### Rely on sendmail/smtp or sendmail/pipe below to override default mts.
 mts_fakesendmail="${MHMTSCONF}-fakesendmail"
 cp "${MHMTSCONF}" "$mts_fakesendmail"
-printf "sendmail: ${srcdir}/test/fakesendmail\n" >>"$mts_fakesendmail"
+printf 'sendmail: %s/test/fakesendmail\n' "$srcdir" >>"$mts_fakesendmail"
 MHMTSCONF="$mts_fakesendmail"
 
 # $1: -mts switch selection
@@ -35,7 +35,7 @@ MHMTSCONF="$mts_fakesendmail"
 test_alias ()
 {
   if [ "$1" = 'sendmail/smtp' ]; then
-    send -draft -alias "${MH_TEST_DIR}/Mail/aliases" -mts sendmail/smtp
+    run_prog send -draft -alias "${MH_TEST_DIR}/Mail/aliases" -mts sendmail/smtp
 
     # fakesendmail drops the message and any cc's into this mbox.
     mbox="${MH_TEST_DIR}"/Mail/fakesendmail.mbox
@@ -56,17 +56,17 @@ test_alias ()
 
   elif [ "$1" = 'sendmail/pipe' ]; then
     set +e
-    send -draft -alias "${MH_TEST_DIR}/Mail/aliases" -mts sendmail/pipe \
-      >"${testname}.actual" 2>&1
+    run_prog send -draft -alias "${MH_TEST_DIR}/Mail/aliases" \
+      -mts sendmail/pipe >"${testname}.actual" 2>&1
     if [ $? -eq 0 ]; then
-      printf "$0: sendmail/pipe should have failed but didn't\n"
+      printf '%s: sendmail/pipe should have failed but didn'"'"'t\n' "$0"
     else
       set -e
       check "${testname}.actual" "$2"
     fi
 
   else
-    printf "$0: invalid -mts switch selection\n"
+    printf '%s: invalid -mts switch selection\n' "$0"
     exit 1
   fi
 }
@@ -86,6 +86,8 @@ cat >"${testname}.expected" <<EOF
 From: Mr Nobody <nobody@example.com>
 To: Blind List: ;
 Subject: blind list test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is test of a blind list.
@@ -106,6 +108,8 @@ DATA
 From: Mr Nobody <nobody@example.com>
 To: Blind List: ;
 Subject: blind list test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is test of a blind list.
@@ -129,6 +133,8 @@ cat >"${testname}.expected" <<EOF
 From: Mr Nobody <nobody@example.com>
 To: "named.list" <one@example.com>, "named.list" <two@example.com>
 Subject: named list test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
 Date:
 
 This is test of a named list.