Merge remote-tracking branch 'origin' into convertargs

[nmh] / test / format / test-fmtdump

diff --git a/test/format/test-fmtdump b/test/format/test-fmtdump
index 44380bad849aced522bd17b789f6a5c8c52bad53..5680a5b1fbbceafcafe9108a3084eebe8392387d 100755 (executable)
--- a/test/format/test-fmtdump
+++ b/test/format/test-fmtdump
@@ -17,7 +17,7 @@ fi
 setup_test
 
 # Use proper program, likely not the first one on PATH.
-fmtdump="${MH_LIB_DIR}/fmtdump"
+fmtdump="${MH_LIBEXEC_DIR}/fmtdump"
 
 expected=$MH_TEST_DIR/$$.expected
 expected_err=$MH_TEST_DIR/$$.expected_err
@@ -41,7 +41,7 @@ check $expected $actual
 # check -version
 case `$fmtdump -v` in
   fmtdump\ --*) ;;
-  *           ) printf "$0: fmtdump -v generated unexpected output\n" >&2
+  *           ) printf '%s: fmtdump -v generated unexpected output\n' "$0" >&2
                 failed=`expr ${failed:-0} + 1`;;
 esac
 
@@ -106,11 +106,11 @@ L10:      CHAR '\n'
        DONE
 EOF
 
-$fmtdump >$actual 2>&1
+run_prog $fmtdump >$actual 2>&1
 check $expected $actual 'keep first'
 
 # check -form
-$fmtdump -form "$MH_TEST_DIR/Mail/scan.default" >$actual 2>&1
+run_prog $fmtdump -form "$MH_INST_DIR${nmhetcdir}/scan.default" >$actual 2>&1
 check $expected $actual
 
 # check -format
@@ -122,7 +122,7 @@ cat >$expected <<EOF
 L0:    DONE
 EOF
 
-$fmtdump -format '%<(lit 1234567890)%(strlen)%>' >$actual 2>&1
+run_prog $fmtdump -format '%<(lit 1234567890)%(strlen)%>' >$actual 2>&1
 check $expected $actual