X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fmhbuild%2Ftest-forw;h=21677380162d9562b690084fa6208278c551df52;hb=d8c7d4f2c785d35cebd5ea64213a335561a57f7d;hp=448a17c906e9baeb8c8de2758a3a0b27c92a484f;hpb=d00b170aa19a82a22bf55516f2cdb33e26deca0c;p=mmh diff --git a/test/mhbuild/test-forw b/test/mhbuild/test-forw index 448a17c..2167738 100755 --- a/test/mhbuild/test-forw +++ b/test/mhbuild/test-forw @@ -26,12 +26,6 @@ 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 /' $draft > $actual -} - 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" -Content-ID: Content-Description: forwarded messages ------- =_aaaaaaaaaa0 @@ -72,9 +65,8 @@ This is message number 2 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 < Content-Description: forwarded messages @@ -110,8 +101,7 @@ This is message number 2 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