Gain coverage with `mhparam localmbox'.

[nmh] / test / dist / test-dist

diff --git a/test/dist/test-dist b/test/dist/test-dist
index 2f1e4f3e0d39d38f5bff3398f24dca82f2a00449..6f73555d59158b3f23ca4a69beaf75ef6e3f14fe 100755 (executable)
--- a/test/dist/test-dist
+++ b/test/dist/test-dist
@@ -16,6 +16,8 @@ fi
 
 setup_test
 
+! dist - >/dev/null 2>&1 # gcov
+
 expected=$MH_TEST_DIR/$$.expected
 expected_err=$MH_TEST_DIR/$$.expected_err
 actual=$MH_TEST_DIR/$$.actual
@@ -71,7 +73,8 @@ Usage: dist [+folder] [msg] [switches]
   -[no]atfile
 EOF
 
-dist -help >"$actual" 2>&1
+#### Skip nmh intro text.
+dist -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
@@ -388,8 +391,7 @@ run_test 'scan +outbox -width 6 2' '   2  '
 # Check that dist encodes headers using RFC-2047 properly
 #
 
-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
 
 cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
@@ -397,14 +399,14 @@ To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
 Message-Id: 1@test.nmh
 Subject: Testing message 1
-Resent-From: =?UTF-8?Q?Mr_F=C3=B8o_Bar?= <foo@bar.com>
-Resent-To: =?UTF-8?Q?Mr_Nobod=C3=BF?= <nobody@nowhere.com>
+Resent-From: =?UTF-8?Q?Mr_F=C3=B8o_Bar?= <resent-from@example.com>
+Resent-To: =?UTF-8?Q?Mr_Nobod=C3=BF?= <resent-to@example.com>
 Resent-Date:
 
 This is message number 1
 EOF
 
-test_dist +inbox 1 -noedit -from 'Mr Føo Bar <foo@bar.com>' \
-         -to 'Mr Nobodÿ <nobody@nowhere.com>' -fcc +outbox
+test_dist +inbox 1 -noedit -from 'Mr Føo Bar <resent-from@example.com>' \
+         -to 'Mr Nobodÿ <resent-to@example.com>' -fcc +outbox
 
 exit ${failed:-0}