X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c6bf562d9e823f02fb4a9e6dfb89bf93a0e9d0ab..7540f02725475698a47046ebf4e55b3e8dea5ab6:/test/mhbuild/test-forw

diff --git a/test/mhbuild/test-forw b/test/mhbuild/test-forw
index 448a17c9..d543086f 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,18 +28,13 @@ 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"
-draftorig="$MH_TEST_DIR/,$$.draft.orig"
+draftorig="$MH_TEST_DIR/`mhparam sbackup`$$.draft.orig"
 expected="$MH_TEST_DIR/$$.expected"
 actual="$MH_TEST_DIR/$$.actual"
 
 # check mhbuild
+start_test "mhbuild"
 cat > $expected <<EOF
 To:
 cc:
@@ -45,7 +42,6 @@ Fcc: +outbox
 Subject:
 MIME-Version: 1.0
 Content-Type: multipart/digest; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <TESTID>
 Content-Description: forwarded messages
 
 ------- =_aaaaaaaaaa0
@@ -54,6 +50,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
@@ -64,6 +61,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
@@ -71,12 +69,12 @@ This is message number 2
 ------- =_aaaaaaaaaa0--
 EOF
 mkdraft
-mhbuild $draft
-mungedraft
-check $expected $actual
-test ${failed:-0} -eq 0  &&  rm "$draft" "$draftorig"
+run_prog mhbuild $draft
+check $expected $draft
+test ${failed:-0} -eq 0  &&  rm "$draftorig"
 
 # check mhbuild -rfc934
+start_test "mhbuild -rfc934"
 cat > $expected <<EOF
 To:
 cc:
@@ -84,7 +82,6 @@ Fcc: +outbox
 Subject:
 MIME-Version: 1.0
 Content-Type: multipart/digest; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <TESTID>
 Content-Description: forwarded messages
 
 
@@ -93,6 +90,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
@@ -102,6 +100,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
@@ -109,9 +108,9 @@ This is message number 2
 ------- =_aaaaaaaaaa0--
 EOF
 mkdraft
-mhbuild -rfc934 $draft
-mungedraft
-check $expected $actual
-test ${failed:-0} -eq 0  &&  rm "$draft" "$draftorig"
+run_prog mhbuild -rfc934 $draft
+check $expected $draft
+test ${failed:-0} -eq 0  &&  rm "$draftorig"
 
+finish_test
 exit $failed