X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0f0af4e32a4d734209c16282b63f7cb1094e2699..9b3fc4790b2473b23c69c0e70710e1e66a038f28:/test/rcv/test-rcvdist

diff --git a/test/rcv/test-rcvdist b/test/rcv/test-rcvdist
index 8dea84dd..21d5904e 100755
--- a/test/rcv/test-rcvdist
+++ b/test/rcv/test-rcvdist
@@ -17,7 +17,7 @@ fi
 setup_test
 
 # Use proper program, likely not the first one on PATH.
-rcvdist="${MH_LIB_DIR}/rcvdist"
+rcvdist="${MH_LIBEXEC_DIR}/rcvdist"
 
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
@@ -32,7 +32,8 @@ Usage: rcvdist [switches] [switches for postproc] address ...
   -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
@@ -59,7 +60,7 @@ MHMTSCONF="$mts_fakesendmail"
 # 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
@@ -75,13 +76,14 @@ test_rcvdist ()
 }
 
 # 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
-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:
 
@@ -95,6 +97,7 @@ cat > "$expected" <<EOF
 From: Test2 <test2@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 2@test.nmh
 Subject: Testing message 2
 Resent-To: recipient@example.com
 Resent-From: Some User <user@example.com>