Merge remote-tracking branch 'origin' into convertargs

[nmh] / test / dist / test-dist

diff --git a/test/dist/test-dist b/test/dist/test-dist
index c5182afaf8b55c72b19aa095cdbe17bbd53265e4..2f1e4f3e0d39d38f5bff3398f24dca82f2a00449 100755 (executable)
--- a/test/dist/test-dist
+++ b/test/dist/test-dist
@@ -20,7 +20,7 @@ expected=$MH_TEST_DIR/$$.expected
 expected_err=$MH_TEST_DIR/$$.expected_err
 actual=$MH_TEST_DIR/$$.actual
 actual_err=$MH_TEST_DIR/$$.actual_err
 expected_err=$MH_TEST_DIR/$$.expected_err
 actual=$MH_TEST_DIR/$$.actual
 actual_err=$MH_TEST_DIR/$$.actual_err

-localmbox=`${MH_LIB_DIR}/ap -format "%(localmbox)" 0 | sed 's/^<\(.*\)>$/\1/'`
+localmbox=`${MH_LIBEXEC_DIR}/ap -format "%(localmbox)" 0 | sed 's/^<\(.*\)>$/\1/'`

 
 #### Use sendmail/pipe below to override default mts.
 mts_fakesendmail="${MHMTSCONF}-fakesendmail"
 
 #### Use sendmail/pipe below to override default mts.
 mts_fakesendmail="${MHMTSCONF}-fakesendmail"


@@ -31,7 +31,7 @@ MHMTSCONF="$mts_fakesendmail"
 # arguments: dist switches
 test_dist ()
 {
 # arguments: dist switches
 test_dist ()
 {

-  printf 'send\n' | dist "$@" >/dev/null
+  printf 'send\n' | run_prog dist "$@" >/dev/null

 
   # fakesendmail drops the message and any cc's into this mbox.
   mbox="${MH_TEST_DIR}"/Mail/fakesendmail.mbox
 
   # fakesendmail drops the message and any cc's into this mbox.
   mbox="${MH_TEST_DIR}"/Mail/fakesendmail.mbox


@@ -366,7 +366,7 @@ This is message number 1
 EOF
 
 test_dist 1 -noedit -to somebody@example.com -fcc outbox
 EOF
 
 test_dist 1 -noedit -to somebody@example.com -fcc outbox

-run_test 'scan +outbox -width 6' '   1 '
+run_test 'scan +outbox -width 6' '   1  '

 
 cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 
 cat >"$expected" <<EOF
 From: Test1 <test1@example.com>


@@ -382,7 +382,29 @@ This is message number 1
 EOF
 
 test_dist +inbox 1 -noedit -to somebody@example.com -fcc +outbox
 EOF
 
 test_dist +inbox 1 -noedit -to somebody@example.com -fcc +outbox

-run_test 'scan +outbox -width 6 2' '   2 '
+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
+
+cat >"$expected" <<EOF
+From: Test1 <test1@example.com>
+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-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

 
 exit ${failed:-0}
 
 exit ${failed:-0}