Alter HasSuffixC()'s char * to be const.

[nmh] / test / rcv / test-rcvdist

diff --git a/test/rcv/test-rcvdist b/test/rcv/test-rcvdist
index e49b390268d672ec2502e22178b7831ce8a9b34d..21d5904e50aeb69e5c808a03a894dbe5a0ac9299 100755 (executable)
--- 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.
 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
 
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual


@@ -32,13 +32,14 @@ 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
 case `$rcvdist -v` in
   rcvdist\ --*) ;;
 check "$expected" "$actual"
 
 # check -version
 case `$rcvdist -v` in
   rcvdist\ --*) ;;

-  *           ) printf "$0: rcvdist -v generated unexpected output\n" >&2
+  *           ) printf '%s: rcvdist -v generated unexpected output\n' "$0" >&2

                 failed=`expr ${failed:-0} + 1`;;
 esac
 
                 failed=`expr ${failed:-0} + 1`;;
 esac
 


@@ -53,13 +54,13 @@ run_test "$rcvdist" \
 #### Use sendmail/pipe below to override default mts.
 mts_fakesendmail="${MHMTSCONF}-fakesendmail"
 sed -e 's/^mts:.*/mts: sendmail\/pipe/' "${MHMTSCONF}" > "$mts_fakesendmail"
 #### Use sendmail/pipe below to override default mts.
 mts_fakesendmail="${MHMTSCONF}-fakesendmail"
 sed -e 's/^mts:.*/mts: sendmail\/pipe/' "${MHMTSCONF}" > "$mts_fakesendmail"

-printf "sendmail: ${srcdir}/test/fakesendmail\n" >>"$mts_fakesendmail"
+printf 'sendmail: %s/test/fakesendmail\n' "$srcdir" >>"$mts_fakesendmail"

 MHMTSCONF="$mts_fakesendmail"
 
 # arguments: rcvdist switches
 test_rcvdist ()
 {
 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
 
   # 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
 }
 
 # 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
 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
 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:
 


@@ -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
 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>
 Subject: Testing message 2
 Resent-To: recipient@example.com
 Resent-From: Some User <user@example.com>