Review inc.man.

[nmh] / test / rcv / test-rcvdist

diff --git a/test/rcv/test-rcvdist b/test/rcv/test-rcvdist
index 311cdc9c3901c748733963a28b6475e4380e742d..857a4edce37d2613fcaa370aff5e79aa14eb5817 100755 (executable)
--- a/test/rcv/test-rcvdist
+++ b/test/rcv/test-rcvdist
@@ -17,7 +17,9 @@ fi
 setup_test
 
 # Use proper program, likely not the first one on PATH.
 setup_test
 
 # Use proper program, likely not the first one on PATH.

-rcvdist="${MH_LIB_DIR}/rcvdist"
+rcvdist="${MH_LIBEXEC_DIR}/rcvdist"
+
+check_exit '-eq 1' $rcvdist -

 
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
 
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual


@@ -32,7 +34,8 @@ Usage: rcvdist [switches] [switches for postproc] address ...
   -help
 EOF
 
   -help
 EOF
 

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

 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version


@@ -59,7 +62,7 @@ MHMTSCONF="$mts_fakesendmail"
 # arguments: rcvdist switches
 test_rcvdist ()
 {
 # arguments: rcvdist switches
 test_rcvdist ()
 {

-  $rcvdist "$@"
+  run_prog $rcvdist "$@"

 
   # 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


@@ -75,14 +78,14 @@ test_rcvdist ()
 }
 
 # check with address
 }
 
 # check with address

-

 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
 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: `${MH_LIB_DIR}/ap -format '%(localmbox)' 0`
+Resent-From: `${MH_LIBEXEC_DIR}/ap -format '%(localmbox)' 0 | \
+              sed 's/^<\(.*\)>$/\1/'`

 Resent-To: recipient@example.com
 Resent-Date:
 
 Resent-To: recipient@example.com
 Resent-Date: