X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a4390a1c51b3a709d6aeefeba2fdd6fa8d525012..cfa0a64bc8d5f9dae7d2aebeab0f383a57236743:/test/mhbuild/test-utf8-body?ds=sidebyside diff --git a/test/mhbuild/test-utf8-body b/test/mhbuild/test-utf8-body index 2998da4b..e4a7c4e4 100755 --- a/test/mhbuild/test-utf8-body +++ b/test/mhbuild/test-utf8-body @@ -21,13 +21,13 @@ testname="${MH_TEST_DIR}/$$" #### Rely on sendmail/pipe below to override default mts. mts_fakesendmail="${MHMTSCONF}-fakesendmail" cp "${MHMTSCONF}" "$mts_fakesendmail" -printf "sendmail: ${srcdir}/test/fakesendmail\n" >>"$mts_fakesendmail" +printf 'sendmail: %s/test/fakesendmail\n' "$srcdir" >>"$mts_fakesendmail" MHMTSCONF="$mts_fakesendmail" # argument: expected output test_attachment () { - send -draft -mts sendmail/pipe + run_prog send -draft -mts sendmail/pipe # fakesendmail drops the message and any cc's into this mbox. mbox="${MH_TEST_DIR}"/Mail/fakesendmail.mbox @@ -39,7 +39,7 @@ test_attachment () # 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 charset. # - sed -e 's/^Date:.*/Date:/' -e 's/; charset=".*//' \ + sed -e 's/^Date:.*/Date:/' -e 's/; charset="[^;]*//' \ "`mhpath cur`" > "${testname}.actual" check "${testname}.actual" "$1" @@ -93,7 +93,7 @@ To: Somebody Subject: Test Nmh-Attachment: $MH_TEST_DIR/attachment.txt -¡Ay, caramba! +¡Ay, caramba! EOF cat > "${testname}.expected" <