X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/fe36a7ee2f4304fd3797443d4f2f950d6dc2475d..refs/heads/master:/test/mhbuild/test-attach?ds=sidebyside

diff --git a/test/mhbuild/test-attach b/test/mhbuild/test-attach
index 3b285ef6..93144604 100755
--- a/test/mhbuild/test-attach
+++ b/test/mhbuild/test-attach
@@ -14,8 +14,7 @@ fi
 
 setup_test
 
-require_locale en_US.utf-8 en_US.utf8
-LC_ALL=en_US.UTF-8; export LC_ALL
+require_locale en_US.UTF-8 en_US.UTF8 en_US.utf-8 en_US.utf8
 
 draft="$MH_TEST_DIR/$$.draft"
 backup="${MH_TEST_DIR}/`mhparam sbackup`$$.draft.orig"
@@ -52,6 +51,7 @@ check "$draft" "$expected"
 
 #
 # Check out more common case, one (or more) attachments
+start_test "out more common case, one (or more) attachments"
 # along with message text.
 #
 
@@ -129,6 +129,7 @@ check "$draft" "$expected"
 
 #
 # Check a completely empty message
+start_test "a completely empty message"
 #
 
 cat > "$draft" <<EOF
@@ -149,36 +150,6 @@ MIME-Version: 1.0
 Content-Type: text/plain
 EOF
 
-#
-# Check an md5'd attachment
-#
-
-cat > "$draft" <<EOF
-To: Mr Test <mrtest@example.com>
-cc:
-Fcc: +outbox
-Subject: Test of digested part
-
-#text/plain; name="textplain" [ - ] ${srcdir}/test/mhbuild/textplain
-
-EOF
-
-mhbuild -check "$draft"
-
-cat > "$expected" <<EOF
-To: Mr Test <mrtest@example.com>
-cc:
-Fcc: +outbox
-Subject: Test of digested part
-MIME-Version: 1.0
-Content-Type: text/plain; name="textplain"; charset="us-ascii"
-Content-Description:  - 
-Content-MD5: x3hNJn10cGowZv+ILUkycw==
-Content-Transfer-Encoding: quoted-printable
-
-This is a text/plain part.
-EOF
-
 check "$draft" "$expected"
 
 #
@@ -361,6 +332,7 @@ EOF
 check "$draft" "$expected"
 
 # check that blank line is inserted between header and content
+start_test "that blank line is inserted between header and content"
 
 cat > "$MH_TEST_DIR/Mail/oneline" <<EOF
 There needs to be a blank line before this content line.
@@ -406,4 +378,5 @@ check "$draft" "$expected"
 
 [ ${failed:=0} -eq 0 ]  &&  rm -f ${backup}
 
+finish_test
 exit ${failed:-0}