Added mhbuild: -nocontentid to profile used for tests, to simplify

output checking.

diff --git a/test/common.sh.in b/test/common.sh.in
index 3e656599ff30da82f93329fd29d3e2d999356acb..be97b1a91da1a5d5f19ab12806f3813957b9955f 100644 (file)
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -163,12 +163,13 @@ setup_test ()
   cat > "$MH" <<EOF || exit 1
 Path: ${MH_TEST_DIR}/Mail
 buildmimeproc: ${MH_INST_DIR}${bindir}/mhbuild
   cat > "$MH" <<EOF || exit 1
 Path: ${MH_TEST_DIR}/Mail
 buildmimeproc: ${MH_INST_DIR}${bindir}/mhbuild

+fileproc: ${MH_INST_DIR}${bindir}/refile

 libdir: ${MH_LIB_DIR}
 libdir: ${MH_LIB_DIR}

+mhbuild: -nocontentid

 mhlproc: ${MH_LIB_DIR}/mhl
 moreproc: cat
 mhlproc: ${MH_LIB_DIR}/mhl
 moreproc: cat

-showproc: ${MH_LIB_DIR}/mhl

 postproc: ${MH_LIB_DIR}/post
 postproc: ${MH_LIB_DIR}/post

-fileproc: ${MH_INST_DIR}${bindir}/refile
+showproc: ${MH_LIB_DIR}/mhl

 EOF
 
   for f in MailAliases components digestcomps distcomps forwcomps mhl.body \
 EOF
 
   for f in MailAliases components digestcomps distcomps forwcomps mhl.body \

diff --git a/test/mhbuild/test-forw b/test/mhbuild/test-forw
index 448a17c906e9baeb8c8de2758a3a0b27c92a484f..21677380162d9562b690084fa6208278c551df52 100755 (executable)
--- a/test/mhbuild/test-forw
+++ b/test/mhbuild/test-forw
@@ -26,12 +26,6 @@ Subject:
 EOF
 }
 
 EOF
 }
 

-# Munge the Content-Id from the draft after mhbuild, so we have a reliable
-# value to check.
-mungedraft() {
-    sed 's/\(Content-ID:\) <[^>][^>]*>/\1 <TESTID>/' $draft > $actual
-}
-

 draft="$MH_TEST_DIR/$$.draft"
 draftorig="$MH_TEST_DIR/,$$.draft.orig"
 expected="$MH_TEST_DIR/$$.expected"
 draft="$MH_TEST_DIR/$$.draft"
 draftorig="$MH_TEST_DIR/,$$.draft.orig"
 expected="$MH_TEST_DIR/$$.expected"


@@ -45,7 +39,6 @@ Fcc: +outbox
 Subject:
 MIME-Version: 1.0
 Content-Type: multipart/digest; boundary="----- =_aaaaaaaaaa0"
 Subject:
 MIME-Version: 1.0
 Content-Type: multipart/digest; boundary="----- =_aaaaaaaaaa0"

-Content-ID: <TESTID>

 Content-Description: forwarded messages
 
 ------- =_aaaaaaaaaa0
 Content-Description: forwarded messages
 
 ------- =_aaaaaaaaaa0


@@ -72,9 +65,8 @@ This is message number 2
 EOF
 mkdraft
 mhbuild $draft
 EOF
 mkdraft
 mhbuild $draft

-mungedraft
-check $expected $actual
-test ${failed:-0} -eq 0  &&  rm "$draft" "$draftorig"
+check $expected $draft
+test ${failed:-0} -eq 0  &&  rm "$draftorig"

 
 # check mhbuild -rfc934
 cat > $expected <<EOF
 
 # check mhbuild -rfc934
 cat > $expected <<EOF


@@ -84,7 +76,6 @@ Fcc: +outbox
 Subject:
 MIME-Version: 1.0
 Content-Type: multipart/digest; boundary="----- =_aaaaaaaaaa0"
 Subject:
 MIME-Version: 1.0
 Content-Type: multipart/digest; boundary="----- =_aaaaaaaaaa0"

-Content-ID: <TESTID>

 Content-Description: forwarded messages
 
 
 Content-Description: forwarded messages
 
 


@@ -110,8 +101,7 @@ This is message number 2
 EOF
 mkdraft
 mhbuild -rfc934 $draft
 EOF
 mkdraft
 mhbuild -rfc934 $draft

-mungedraft
-check $expected $actual
-test ${failed:-0} -eq 0  &&  rm "$draft" "$draftorig"
+check $expected $draft
+test ${failed:-0} -eq 0  &&  rm "$draftorig"

 
 exit $failed
 
 exit $failed

diff --git a/test/mhbuild/test-utf8-body b/test/mhbuild/test-utf8-body
index e7cb2f8300bc35fec5b366732803f35da2b564d4..42ea3e0fe8fe6d5ab9d62cb2c2009cc86f91f52a 100755 (executable)
--- a/test/mhbuild/test-utf8-body
+++ b/test/mhbuild/test-utf8-body
@@ -39,11 +39,9 @@ test_attachment ()
   #
   # It's hard to calculate the exact Date: header post is going to
   # use, so we'll just use sed to remove the actual date so we can easily
   #
   # It's hard to calculate the exact Date: header post is going to
   # use, so we'll just use sed to remove the actual date so we can easily

-  # compare it against our "correct" output.  And same for
-  # Content-ID and charset.
+  # compare it against our "correct" output.  And same for charset.

   #
   sed -e 's/^Date:.*/Date:/' \
   #
   sed -e 's/^Date:.*/Date:/' \

-      -e 's/^Content-ID:.*/Content-ID:/' \

       -e 's/; charset=".*//' \
       "$cur" > "${testname}.actual"
 
       -e 's/; charset=".*//' \
       "$cur" > "${testname}.actual"
 


@@ -70,7 +68,6 @@ To: Somebody Else <somebody@example.com>
 Subject: Test
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 Subject: Test
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"

-Content-ID:

 Date:
 
 ------- =_aaaaaaaaaa0
 Date:
 
 ------- =_aaaaaaaaaa0


@@ -108,7 +105,6 @@ To: Somebody Else <somebody@example.com>
 Subject: Test
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 Subject: Test
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"

-Content-ID:

 Date:
 
 ------- =_aaaaaaaaaa0
 Date:
 
 ------- =_aaaaaaaaaa0

diff --git a/test/mhmail/test-mhmail b/test/mhmail/test-mhmail
index 5a7117bb1621b1dcf3b8ab32efc36506c5897ebf..fdb361758136a5a44bd1c5031d5c77d538075eb3 100755 (executable)
--- a/test/mhmail/test-mhmail
+++ b/test/mhmail/test-mhmail
@@ -57,8 +57,7 @@ test_mhmail ()
 
     sed -e 's/^Date:.*/Date:/' \
         -e 's/^Resent-Date:.*/Resent-Date:/' \
 
     sed -e 's/^Date:.*/Date:/' \
         -e 's/^Resent-Date:.*/Resent-Date:/' \

-        -e 's/^Message-ID:.*/Message-ID:/' \
-        -e 's/^Content-ID:.*/Content-ID:/' "$actual" > "$actual".nodate
+        -e 's/^Message-ID:.*/Message-ID:/' "$actual" > "$actual".nodate

     rm -f "$actual"
 
     check "$actual".nodate "$1"
     rm -f "$actual"
 
     check "$actual".nodate "$1"


@@ -795,7 +794,6 @@ To: recipient@example.com
 From: sender@example.com
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 From: sender@example.com
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"

-Content-ID:

 Date:
 Message-ID:
 
 Date:
 Message-ID: