Fixed removal of <> in test-dist and test-rcvdist.

diff --git a/test/dist/test-dist b/test/dist/test-dist
index 190aeeb0db8a71543cdd707a94dd476e7e4a84f3..ca6a70b1e2b665df749f1ffd37418bc2601d8cc2 100755 (executable)
--- a/test/dist/test-dist
+++ b/test/dist/test-dist
@@ -20,7 +20,7 @@ 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_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 -e 's/^<//; s/>$//;'`
+localmbox=`${MH_LIB_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"

diff --git a/test/rcv/test-rcvdist b/test/rcv/test-rcvdist
index b686a12c4e4b53361b4aae43b31b32a602456826..5e34615eedd2dd6741eb21e48f651670e210f6db 100755 (executable)
--- a/test/rcv/test-rcvdist
+++ b/test/rcv/test-rcvdist
@@ -82,7 +82,7 @@ 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 | \
 Message-Id: 1@test.nmh
 Subject: Testing message 1
 Resent-From: `${MH_LIB_DIR}/ap -format '%(localmbox)' 0 | \

-              sed -e 's/^<//; s/>$//;'`
+              sed 's/^<\(.*\)>$/\1/'`

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