Clarified advisory message it test-mhfixmsg if a text browser

[nmh] / test / dist / test-dist

diff --git a/test/dist/test-dist b/test/dist/test-dist
index 769406cbb89d8a8a64bf7d250e441405352ce43c..2bb1d30f7882a85d1ead30580869f96c1be75c86 100755 (executable)
--- a/test/dist/test-dist
+++ b/test/dist/test-dist
@@ -20,7 +20,7 @@ expected=$MH_TEST_DIR/$$.expected
 expected_err=$MH_TEST_DIR/$$.expected_err
 actual=$MH_TEST_DIR/$$.actual
 actual_err=$MH_TEST_DIR/$$.actual_err
 expected_err=$MH_TEST_DIR/$$.expected_err
 actual=$MH_TEST_DIR/$$.actual
 actual_err=$MH_TEST_DIR/$$.actual_err

-localmbox=`${MH_LIB_DIR}/ap -format "%(localmbox)" 0`
+localmbox=`${MH_LIB_DIR}/ap -format "%(localmbox)" 0 | sed 's/^<\(.*\)>$/\1/'`

 
 #### Use sendmail/pipe below to override default mts.
 mts_fakesendmail="${MHMTSCONF}-fakesendmail"
 
 #### Use sendmail/pipe below to override default mts.
 mts_fakesendmail="${MHMTSCONF}-fakesendmail"


@@ -31,7 +31,7 @@ MHMTSCONF="$mts_fakesendmail"
 # arguments: dist switches
 test_dist ()
 {
 # arguments: dist switches
 test_dist ()
 {

-  printf 'send\n' | dist "$@" >/dev/null
+  printf 'send\n' | run_prog dist "$@" >/dev/null

 
   # fakesendmail drops the message and any cc's into this mbox.
   mbox="${MH_TEST_DIR}"/Mail/fakesendmail.mbox
 
   # fakesendmail drops the message and any cc's into this mbox.
   mbox="${MH_TEST_DIR}"/Mail/fakesendmail.mbox


@@ -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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 Subject: Testing message 2
 
 This is message number 2


@@ -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
 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
 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
 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
 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
 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
 Subject: Testing message 8
 Resent-From: ${localmbox}
 Resent-To: somebody@example.com


@@ -239,20 +247,21 @@ EOF
 
   # check -inplace
   # Hard link the message and verify that the new one does get annotated.
 
   # check -inplace
   # Hard link the message and verify that the new one does get annotated.

-  ln "${MH_TEST_DIR}/Mail/inbox/8" "${MH_TEST_DIR}/Mail/inbox/8.link"
+  ln "${MH_TEST_DIR}/Mail/inbox/9" "${MH_TEST_DIR}/Mail/inbox/9.link"

   cat >"$expected" <<EOF
   cat >"$expected" <<EOF

-From: Test8 <test8@example.com>
+From: Test9 <test9@example.com>

 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00

-Subject: Testing message 8
+Message-Id: 9@test.nmh
+Subject: Testing message 9

 Resent-From: ${localmbox}
 Resent-To: somebody@example.com
 Resent-Date:
 
 Resent-From: ${localmbox}
 Resent-To: somebody@example.com
 Resent-Date:
 

-This is message number 8
+This is message number 9

 EOF
 EOF

-  test_dist 8 -noedit -to somebody@example.com -annotate -noinplace -inplace
-  check "${MH_TEST_DIR}/Mail/inbox/8" "${MH_TEST_DIR}/Mail/inbox/8.link"
+  test_dist 9 -noedit -to somebody@example.com -annotate -noinplace -inplace
+  check "${MH_TEST_DIR}/Mail/inbox/9" "${MH_TEST_DIR}/Mail/inbox/9.link"

 fi
 
 # check -draftfolder
 fi
 
 # check -draftfolder


@@ -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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 Subject: Testing message 1
 Resent-From: ${localmbox}
 Resent-To: somebody@example.com