lkopen_dot() would block forever if another process held a lock

[nmh] / test / mhbuild / test-utf8-body

diff --git a/test/mhbuild/test-utf8-body b/test/mhbuild/test-utf8-body
index 42ea3e0fe8fe6d5ab9d62cb2c2009cc86f91f52a..9798ac26b1ae17d121c9508f030c3f30b1dc04e9 100755 (executable)
--- a/test/mhbuild/test-utf8-body
+++ b/test/mhbuild/test-utf8-body
@@ -21,29 +21,26 @@ testname="${MH_TEST_DIR}/$$"
 #### Rely on sendmail/pipe below to override default mts.
 mts_fakesendmail="${MHMTSCONF}-fakesendmail"
 cp "${MHMTSCONF}" "$mts_fakesendmail"
 #### Rely on sendmail/pipe below to override default mts.
 mts_fakesendmail="${MHMTSCONF}-fakesendmail"
 cp "${MHMTSCONF}" "$mts_fakesendmail"

-printf "%s\n" "sendmail: ${srcdir}/test/fakesendmail" >>"$mts_fakesendmail"
+printf 'sendmail: %s/test/fakesendmail\n' "$srcdir" >>"$mts_fakesendmail"

 MHMTSCONF="$mts_fakesendmail"
 
 # argument: expected output
 test_attachment ()
 {
 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
   inc -silent -file "$mbox"
   rm -f "$mbox" "$mbox.map"
 
 
   # fakesendmail drops the message and any cc's into this mbox.
   mbox="${MH_TEST_DIR}"/Mail/fakesendmail.mbox
   inc -silent -file "$mbox"
   rm -f "$mbox" "$mbox.map"
 

-  cur=`mhpath cur`
-

   #
   # It's hard to calculate the exact Date: header post is going to
   # 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.
   #
   #
   # It's hard to calculate the exact Date: header post is going to
   # 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=".*//' \
-      "$cur" > "${testname}.actual"
+  sed -e 's/^Date:.*/Date:/' -e 's/; charset="[^;]*//' \
+      "`mhpath cur`" > "${testname}.actual"

 
   check "${testname}.actual" "$1"
 }
 
   check "${testname}.actual" "$1"
 }


@@ -55,16 +52,16 @@ EOF
 
 cat > "${MH_TEST_DIR}/Mail/draft" <<EOF
 From: Mr Nobody <nobody@example.com>
 
 cat > "${MH_TEST_DIR}/Mail/draft" <<EOF
 From: Mr Nobody <nobody@example.com>

-To: Somebody Else <somebody@example.com>
+To: Somebody <somebody@example.com>

 Subject: Test
 Subject: Test

-Nmh-Attachment: $MH_TEST_DIR/attachment.txt
+Attach: $MH_TEST_DIR/attachment.txt

 
 This is a test.
 EOF
 
 cat > "${testname}.expected" <<EOF
 From: Mr Nobody <nobody@example.com>
 
 This is a test.
 EOF
 
 cat > "${testname}.expected" <<EOF
 From: Mr Nobody <nobody@example.com>

-To: Somebody Else <somebody@example.com>
+To: Somebody <somebody@example.com>

 Subject: Test
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 Subject: Test
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"


@@ -87,31 +84,32 @@ EOF
 
 test_attachment "${testname}.expected"
 
 
 test_attachment "${testname}.expected"
 

-# check that 8-bit body is still encoded as quoted-printable
-# text/plain, even with an attachment
+# check that 8-bit body is encoded as quoted-printable text/plain,
+# even with an attachment

 
 cat > "${MH_TEST_DIR}/Mail/draft" <<EOF
 From: Mr Nobody <nobody@example.com>
 
 cat > "${MH_TEST_DIR}/Mail/draft" <<EOF
 From: Mr Nobody <nobody@example.com>

-To: Somebody Else <somebody@example.com>
+To: Somebody <somebody@example.com>

 Subject: Test
 Subject: Test

-Nmh-Attachment: $MH_TEST_DIR/attachment.txt
+Attach: $MH_TEST_DIR/attachment.txt

 
 

-¡Ay, caramba!
+¡Ay, caramba!

 EOF
 
 cat > "${testname}.expected" <<EOF
 From: Mr Nobody <nobody@example.com>
 EOF
 
 cat > "${testname}.expected" <<EOF
 From: Mr Nobody <nobody@example.com>

-To: Somebody Else <somebody@example.com>
+To: Somebody <somebody@example.com>

 Subject: Test
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 Subject: Test
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"

+Content-Transfer-Encoding: 8bit

 Date:
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain
 Date:
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain

-Content-Transfer-Encoding: quoted-printable
+Content-Transfer-Encoding: 8bit

 
 

-=A1Ay, caramba!
+¡Ay, caramba!

 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; name="attachment.txt"
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; name="attachment.txt"


@@ -128,3 +126,9 @@ test_attachment "${testname}.expected"
 rm -f ${MHMTSCONF} "${MH_TEST_DIR}/attachment.txt"
 
 exit ${failed:-0}
 rm -f ${MHMTSCONF} "${MH_TEST_DIR}/attachment.txt"
 
 exit ${failed:-0}

+
+# emacs hackage to ensure that it writes the inverted exclamation
+# point as UTF-8 multibyte character \xC2\xA1 instead of just \xA1.
+# Local Variables:
+# coding: utf-8
+# End: