X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fdist%2Ftest-dist;h=c96ed1aff80b549faa0de914800e25c76ac5a233;hb=b15f35a73878825d1824a710982d6769ece9b6cb;hp=709c847e779d92688aa85076d181e70ae5ae3d5d;hpb=363d8b056113f4a54e84149977eac95505e38d59;p=mmh

diff --git a/test/dist/test-dist b/test/dist/test-dist
index 709c847..c96ed1a 100755
--- a/test/dist/test-dist
+++ b/test/dist/test-dist
@@ -25,13 +25,13 @@ localmbox=`${MH_LIB_DIR}/ap -format "%(localmbox)" 0`
 #### Use sendmail/pipe below to override default mts.
 mts_fakesendmail="${MHMTSCONF}-fakesendmail"
 sed -e 's/^mts:.*/mts: sendmail\/pipe/' "${MHMTSCONF}" > "$mts_fakesendmail"
-printf "sendmail: ${srcdir}/test/fakesendmail\n" >>"$mts_fakesendmail"
+printf 'sendmail: %s/test/fakesendmail\n' "$srcdir" >>"$mts_fakesendmail"
 MHMTSCONF="$mts_fakesendmail"
 
 # arguments: dist switches
 test_dist ()
 {
-  printf "send\n" | dist "$@" >/dev/null
+  printf 'send\n' | dist "$@" >/dev/null
 
   # fakesendmail drops the message and any cc's into this mbox.
   mbox="${MH_TEST_DIR}"/Mail/fakesendmail.mbox
@@ -77,7 +77,7 @@ check "$expected" "$actual"
 # check -version
 case `dist -v` in
   dist\ --*) ;;
-  *        ) printf "$0: dist -v generated unexpected output\n" >&2
+  *        ) printf '%s: dist -v generated unexpected output\n' "$0" >&2
              failed=`expr ${failed:-0} + 1`;;
 esac
 
@@ -95,6 +95,7 @@ cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 1@test.nmh
 Subject: Testing message 1
 Resent-From: ${localmbox}
 Resent-To: somebody@example.com
@@ -112,6 +113,7 @@ cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 1@test.nmh
 Subject: Testing message 1
 Resent-From: ${localmbox}
 Resent-To: somebody@example.com
@@ -132,6 +134,7 @@ cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 1@test.nmh
 Subject: Testing message 1
 Resent-From: me@example.com
 Resent-To: you@example.com
@@ -149,6 +152,7 @@ cat >"$expected" <<EOF
 From: Test2 <test2@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 2@test.nmh
 Subject: Testing message 2
 Resent-From: ${localmbox}
 Resent-To: somebody@example.com
@@ -165,6 +169,7 @@ Resent: somebody@example.com
 From: Test2 <test2@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 2@test.nmh
 Subject: Testing message 2
 
 This is message number 2
@@ -178,7 +183,7 @@ until grep '^Resent:' "${MH_TEST_DIR}"/Mail/inbox/2 >/dev/null; do
   arith_eval $i + 1
   i=$arith_val
   if [ $i -gt 60 ]; then
-    printf "$0: -annotate failed, will not wait any longer\n"
+    printf '%s: -annotate failed, will not wait any longer\n' "$0"
     break
   fi
 done
@@ -194,6 +199,7 @@ cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 1@test.nmh
 Subject: Testing message 1
 Resent-From: ${localmbox}
 Resent-To: somebody@example.com
@@ -208,6 +214,7 @@ cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 1@test.nmh
 Subject: Testing message 1
 
 This is message number 1
@@ -225,6 +232,7 @@ if [ $hard_links_supported -eq 1 ]; then
 From: Test8 <test8@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 8@test.nmh
 Subject: Testing message 8
 Resent-From: ${localmbox}
 Resent-To: somebody@example.com
@@ -244,6 +252,7 @@ EOF
 From: Test8 <test8@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 8@test.nmh
 Subject: Testing message 8
 Resent-From: ${localmbox}
 Resent-To: somebody@example.com
@@ -260,6 +269,7 @@ cat >"$expected" <<EOF
 From: Test3 <test3@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 3@test.nmh
 Subject: Testing message 3
 Resent-From: ${localmbox}
 Resent-To: somebody@example.com
@@ -275,6 +285,7 @@ cat >"$expected" <<EOF
 From: Test3 <test3@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 3@test.nmh
 Subject: Testing message 3
 Resent-From: ${localmbox}
 Resent-To: somebody@example.com
@@ -291,6 +302,7 @@ cat >"$expected" <<EOF
 From: Test3 <test3@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 3@test.nmh
 Subject: Testing message 3
 Resent-From: ${localmbox}
 Resent-To: somebody@example.com
@@ -311,6 +323,7 @@ cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 1@test.nmh
 Subject: Testing message 1
 Resent-From: me@example.com
 Resent-To: somebody@example.com
@@ -326,6 +339,7 @@ cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 1@test.nmh
 Subject: Testing message 1
 Resent-From: ${localmbox}
 Resent-To: somebody@example.com
@@ -342,6 +356,7 @@ cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 1@test.nmh
 Subject: Testing message 1
 Resent-From: ${localmbox}
 Resent-To: somebody@example.com
@@ -357,6 +372,7 @@ cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 1@test.nmh
 Subject: Testing message 1
 Resent-From: ${localmbox}
 Resent-To: somebody@example.com