X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/23af631076209b31fb28feb90a779ff8dcc153a2..762f11f89e80e3611697dce82068ec461044b66a:/test/format/test-localmbox

diff --git a/test/format/test-localmbox b/test/format/test-localmbox
index 196b03b8..32a38565 100755
--- a/test/format/test-localmbox
+++ b/test/format/test-localmbox
@@ -4,21 +4,26 @@
 # component functions
 #
 
-if [ -z "${MH_TEST_COMMON}" ]; then
-	echo "MH_TEST_COMMON not set; try running via 'make check'"
+if test -z "${MH_OBJ_DIR}"; then
+    srcdir=`dirname "$0"`/../..
+    MH_OBJ_DIR=`cd "$srcdir" && pwd`; export MH_OBJ_DIR
 fi
 
-. ${MH_TEST_COMMON}
+. "$MH_OBJ_DIR/test/common.sh"
 
 setup_test
 
 testname="Some User <some@domain.com>"
 
+#### Remove existing Local-Mailbox: profile component, if any.  Then
+#### add one.
+grep -v 'Local-Mailbox: ' ${MH} > ${MH}.new
+mv -f ${MH}.new ${MH}
 echo "Local-Mailbox: ${testname}" >> ${MH}
 
 # We can use "ap" to get the output of format commands
 
-testoutput=$(${MH_LIB_DIR}/ap -format "%(profile Local-Mailbox)" ignore)
+testoutput=`run_prog ${MH_LIBEXEC_DIR}/ap -format "%(localmbox)" ignore`
 
 if [ x"${testname}" != x"${testoutput}" ]; then
 	echo "Expected ${testname}, got ${testoutput}"