Added convenience function die() to mhmail.

[nmh] / test / mhbuild / test-attach
diff --git a/test/mhbuild/test-attach b/test/mhbuild/test-attach

index 00fe1900e344957b4cfa8cf485807c19ae48fb4c..6d5a59452bea4693c5632bbb14ba180e774daee5 100755 (executable)
--- a/test/mhbuild/test-attach
+++ b/test/mhbuild/test-attach
@@ -14,7 +14,10 @@ fi
  
  setup_test
  
+LC_ALL=en_US.UTF-8; export LC_ALL
+
  draft="$MH_TEST_DIR/$$.draft"
+backup="${MH_TEST_DIR}/`mhparam sbackup`$$.draft.orig"
  expected="$MH_TEST_DIR/$$.expected"
  
  #
@@ -187,7 +190,7 @@ Fcc: +outbox
  Subject: An empty dist test
  EOF
  
-LC_ALL=en_US.UTF-8 run_prog mhbuild -dist "$draft"
+run_prog mhbuild -dist "$draft"
  
  cat > "$expected" <<EOF
  To: =?UTF-8?Q?Se=C3=B1or_Test?= <mrtest@example.com>
@@ -222,7 +225,7 @@ This is some HTML tëxt.
  #end
  EOF
  
-LC_ALL=en_US.UTF-8 run_prog mhbuild "$draft"
+run_prog mhbuild "$draft"
  
  cat > "$expected" <<EOF
  To: Mr Test <mrtest@example.com>
@@ -231,23 +234,25 @@ Fcc: +outbox
  Subject: A more complete multipart test
  MIME-Version: 1.0
  Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
+Content-Transfer-Encoding: 8bit
  
  ------- =_aaaaaaaaaa0
  Content-Type: multipart/alternative; boundary="----- =_aaaaaaaaaa1"
+Content-Transfer-Encoding: 8bit
  
  ------- =_aaaaaaaaaa1
  Content-Type: text/plain; charset="UTF-8"
-Content-Transfer-Encoding: quoted-printable
+Content-Transfer-Encoding: 8bit
  
-This is some t=C3=ABxt.
+This is some tëxt.
  
  ------- =_aaaaaaaaaa1
  Content-Type: text/html; charset="UTF-8"
-Content-Transfer-Encoding: quoted-printable
+Content-Transfer-Encoding: 8bit
  
  <html>
  <body>
-This is some HTML t=C3=ABxt.
+This is some HTML tëxt.
  </body>
  </html>
  
@@ -266,4 +271,6 @@ EOF
  
  check "$draft" "$expected"
  
+[ ${failed:=0} -eq 0 ]  &&  rm -f ${backup}
+
  exit ${failed:-0}