From: David Levine <levinedl@acm.org>
Date: Sat, 27 Dec 2014 17:25:48 +0000 (-0600)
Subject: Changed direct access to etc files in a couple of tests to be the
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/8e4c1d2c9112ac3d78238195a79f492a395ac034?hp=59587acfccea34b70fb7110b0cd5a188a9278f22

Changed direct access to etc files in a couple of tests to be the
installed (for the test) versions, not the copies made by common.sh.
---

diff --git a/test/format/test-fmtdump b/test/format/test-fmtdump
index b10374c1..5680a5b1 100755
--- a/test/format/test-fmtdump
+++ b/test/format/test-fmtdump
@@ -110,7 +110,7 @@ run_prog $fmtdump >$actual 2>&1
 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
diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg
index a7932352..b8e0b426 100755
--- a/test/mhfixmsg/test-mhfixmsg
+++ b/test/mhfixmsg/test-mhfixmsg
@@ -25,10 +25,12 @@ expected_err="$MH_TEST_DIR/test-mhfixmsg$$.expected_err"
 actual="$MH_TEST_DIR/test-mhfixmsg$$.actual"
 actual_err="$MH_TEST_DIR/test-mhfixmsg$$.actual_err"
 
-if grep mhfixmsg-format-text/html "${MH_TEST_DIR}/Mail/mhn.defaults" \
+mhn_defaults="$MH_INST_DIR${nmhetcdir}/mhn.defaults"
+
+if grep mhfixmsg-format-text/html "${mhn_defaults}" \
   >/dev/null; then
   can_reformat_texthtml=1
-  if grep 'mhfixmsg-format-text/html.*w3m' "${MH_TEST_DIR}/Mail/mhn.defaults" \
+  if grep 'mhfixmsg-format-text/html.*w3m' "${mhn_defaults}" \
     >/dev/null; then
     #### w3m uses $HOME/.w3m/, and creates it if it doesn't exist.  To
     #### support testing with non-writeable $HOME, and to not leave