From 7219cad5c27edb3ebf63b5354508a66a95bc02d6 Mon Sep 17 00:00:00 2001
From: David Levine <levinedl@acm.org>
Date: Sun, 30 Jun 2013 16:44:23 -0500
Subject: [PATCH] Remove any <> surrounding localmbox in test-dist and
 test-rcvdist, so that the tests pass when the user doesn't have a SIGNATURE
 set.

---
 test/dist/test-dist   | 2 +-
 test/rcv/test-rcvdist | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/dist/test-dist b/test/dist/test-dist
index c96ed1af..190aeeb0 100755
--- 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
-localmbox=`${MH_LIB_DIR}/ap -format "%(localmbox)" 0`
+localmbox=`${MH_LIB_DIR}/ap -format "%(localmbox)" 0 | sed -e 's/^<//; s/>$//;'`
 
 #### 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 311cdc9c..b686a12c 100755
--- a/test/rcv/test-rcvdist
+++ b/test/rcv/test-rcvdist
@@ -75,14 +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 -e 's/^<//; s/>$//;'`
 Resent-To: recipient@example.com
 Resent-Date:
 
-- 
2.56.0