Checked return value of write() calls in mhfixmsg.c,

[nmh] / test / rcv / test-rcvdist

diff --git a/test/rcv/test-rcvdist b/test/rcv/test-rcvdist
index 8dea84dd7e3936c2e916f9d310db31f1b04af5b7..e69e140ecffd0fd1114cfcd00031d54772e9d0fa 100755 (executable)
--- a/test/rcv/test-rcvdist
+++ b/test/rcv/test-rcvdist
@@ -32,7 +32,7 @@ Usage: rcvdist [switches] [switches for postproc] address ...
   -help
 EOF
 
-$rcvdist -help >"$actual" 2>&1
+run_prog $rcvdist -help >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
@@ -59,7 +59,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 +75,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_LIB_DIR}/ap -format '%(localmbox)' 0 | \
+              sed 's/^<\(.*\)>$/\1/'`
 Resent-To: recipient@example.com
 Resent-Date:
 
@@ -95,6 +96,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>