X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fmhbuild%2Ftest-utf8-body;h=1d7ffa11d624981b0ba710d6d3dca1b06314a540;hb=3389a52068c0edfb73498ff6d205e10545f4fd9f;hp=e7cb2f8300bc35fec5b366732803f35da2b564d4;hpb=d00b170aa19a82a22bf55516f2cdb33e26deca0c;p=mmh

diff --git a/test/mhbuild/test-utf8-body b/test/mhbuild/test-utf8-body
index e7cb2f8..1d7ffa1 100755
--- a/test/mhbuild/test-utf8-body
+++ b/test/mhbuild/test-utf8-body
@@ -34,18 +34,13 @@ test_attachment ()
   inc -silent -file "$mbox"
   rm -f "$mbox" "$mbox.map"
 
-  cur=`mhpath cur`
-
   #
   # 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:/' \
-      -e 's/^Content-ID:.*/Content-ID:/' \
-      -e 's/; charset=".*//' \
-      "$cur" > "${testname}.actual"
+  sed -e 's/^Date:.*/Date:/' -e 's/; charset=".*//' \
+      "`mhpath cur`" > "${testname}.actual"
 
   check "${testname}.actual" "$1"
 }
@@ -57,7 +52,7 @@ EOF
 
 cat > "${MH_TEST_DIR}/Mail/draft" <<EOF
 From: Mr Nobody <nobody@example.com>
-To: Somebody Else <somebody@example.com>
+To: Somebody <somebody@example.com>
 Subject: Test
 Nmh-Attachment: $MH_TEST_DIR/attachment.txt
 
@@ -66,11 +61,10 @@ EOF
 
 cat > "${testname}.expected" <<EOF
 From: Mr Nobody <nobody@example.com>
-To: Somebody Else <somebody@example.com>
+To: Somebody <somebody@example.com>
 Subject: Test
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
-Content-ID:
 Date:
 
 ------- =_aaaaaaaaaa0
@@ -90,12 +84,12 @@ EOF
 
 test_attachment "${testname}.expected"
 
-# check that 8-bit body is still encoded as quoted-printable
-# text/plain, even with an attachment
+# check that 8-bit body is encoded as quoted-printable text/plain,
+# even with an attachment
 
 cat > "${MH_TEST_DIR}/Mail/draft" <<EOF
 From: Mr Nobody <nobody@example.com>
-To: Somebody Else <somebody@example.com>
+To: Somebody <somebody@example.com>
 Subject: Test
 Nmh-Attachment: $MH_TEST_DIR/attachment.txt
 
@@ -104,11 +98,10 @@ EOF
 
 cat > "${testname}.expected" <<EOF
 From: Mr Nobody <nobody@example.com>
-To: Somebody Else <somebody@example.com>
+To: Somebody <somebody@example.com>
 Subject: Test
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
-Content-ID:
 Date:
 
 ------- =_aaaaaaaaaa0