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 c7d89833e8ac7ea95e1ecfb9c342fe515653a40d..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.
 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
 
 expected=$MH_TEST_DIR/$$.expected
 expected_err=$MH_TEST_DIR/$$.expected_err


@@ -110,7 +110,7 @@ run_prog $fmtdump >$actual 2>&1
 check $expected $actual 'keep first'
 
 # check -form
 check $expected $actual 'keep first'
 
 # check -form

-run_prog $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
 check $expected $actual
 
 # check -format