mh-mkstemp.man: Detail exit status as 255 rather than -1.

[nmh] / test / dist / test-dist

diff --git a/test/dist/test-dist b/test/dist/test-dist
index 0d0d7b04361ca59e3f80fa4500176a2bf56f85d8..8039fa77d135f43d4d70866325b45c90e893df30 100755 (executable)
--- a/test/dist/test-dist
+++ b/test/dist/test-dist
@@ -16,11 +16,13 @@ fi
 
 setup_test
 
 
 setup_test
 

+check_exit '-eq 1' dist - # gcov
+

 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=$MH_TEST_DIR/$$.expected
 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"


@@ -71,7 +73,8 @@ Usage: dist [+folder] [msg] [switches]
   -[no]atfile
 EOF
 
   -[no]atfile
 EOF
 

-dist -help >"$actual" 2>&1
+#### Skip nmh intro text.
+dist -help | sed '/^$/,$d' >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 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
 #
 
 # 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>
 
 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
 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
 
 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}
 
 exit ${failed:-0}