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
Subject:
MIME-Version: 1.0
Content-Type: multipart/digest; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <TESTID>
Content-Description: forwarded messages
------- =_aaaaaaaaaa0
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
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
EOF
mkdraft
mhbuild $draft
-mungedraft
-check $expected $actual
+check $expected $draft
+test ${failed:-0} -eq 0 && rm "$draftorig"
# check mhbuild -rfc934
cat > $expected <<EOF
Subject:
MIME-Version: 1.0
Content-Type: multipart/digest; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <TESTID>
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
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
EOF
mkdraft
mhbuild -rfc934 $draft
-mungedraft
-check $expected $actual
+check $expected $draft
+test ${failed:-0} -eq 0 && rm "$draftorig"
exit $failed