Fixed a few very minor issues that cppcheck noticed.

[nmh] / test / format / test-localmbox

diff --git a/test/format/test-localmbox b/test/format/test-localmbox
index 36f9392013bc8846b2ea88ec4a8ff11a656f68cf..e4956410c3c1242adc3606534420593d6b67b0ab 100755 (executable)
--- a/test/format/test-localmbox
+++ b/test/format/test-localmbox
@@ -15,11 +15,15 @@ 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 "%(localmbox)" ignore)
+testoutput=`run_prog ${MH_LIB_DIR}/ap -format "%(localmbox)" ignore`
 
 if [ x"${testname}" != x"${testoutput}" ]; then
        echo "Expected ${testname}, got ${testoutput}"