X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/e107aac243dbd4021e57f4c455c7e3ffd82b819e..532fff590b4cfbfbd0633d6b58ca1ab0fec2777d:/test/mhbuild/test-forw

diff --git a/test/mhbuild/test-forw b/test/mhbuild/test-forw
index 22f32df6..bdbd8c00 100755
--- a/test/mhbuild/test-forw
+++ b/test/mhbuild/test-forw
@@ -14,6 +14,8 @@ fi
 
 setup_test
 
+check_exit '-eq 1' forw -
+
 # Make a draft file forwarding two messages.
 mkdraft() {
     cat > $draft <<EOF
@@ -26,15 +28,10 @@ Subject:
 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
-expected=$MH_TEST_DIR/$$.expected
-actual=$MH_TEST_DIR/$$.actual
+draft="$MH_TEST_DIR/$$.draft"
+draftorig="$MH_TEST_DIR/,$$.draft.orig"
+expected="$MH_TEST_DIR/$$.expected"
+actual="$MH_TEST_DIR/$$.actual"
 
 # check mhbuild
 cat > $expected <<EOF
@@ -44,7 +41,6 @@ Fcc: +outbox
 Subject:
 MIME-Version: 1.0
 Content-Type: multipart/digest; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <TESTID>
 Content-Description: forwarded messages
 
 ------- =_aaaaaaaaaa0
@@ -53,6 +49,7 @@ Content-Type: message/rfc822
 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
@@ -63,6 +60,7 @@ Content-Type: message/rfc822
 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
@@ -70,9 +68,9 @@ This is message number 2
 ------- =_aaaaaaaaaa0--
 EOF
 mkdraft
-mhbuild $draft
-mungedraft
-check $expected $actual
+run_prog mhbuild $draft
+check $expected $draft
+test ${failed:-0} -eq 0  &&  rm "$draftorig"
 
 # check mhbuild -rfc934
 cat > $expected <<EOF
@@ -82,7 +80,6 @@ Fcc: +outbox
 Subject:
 MIME-Version: 1.0
 Content-Type: multipart/digest; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <TESTID>
 Content-Description: forwarded messages
 
 
@@ -91,6 +88,7 @@ Content-Description: forwarded messages
 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
@@ -100,6 +98,7 @@ This is message number 1
 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
@@ -107,8 +106,8 @@ This is message number 2
 ------- =_aaaaaaaaaa0--
 EOF
 mkdraft
-mhbuild -rfc934 $draft
-mungedraft
-check $expected $actual
+run_prog mhbuild -rfc934 $draft
+check $expected $draft
+test ${failed:-0} -eq 0  &&  rm "$draftorig"
 
 exit $failed