Use $MH shortcut for the profile in a few of the tests.

diff --git a/test/install-mh/test-install-mh b/test/install-mh/test-install-mh
index 9798e5e..46d01cd 100755 (executable)
--- a/test/install-mh/test-install-mh
+++ b/test/install-mh/test-install-mh
@@ -49,7 +49,7 @@ n
 $installpath
 y" | run_prog install-mh >/dev/null
 
-if [ -f $MH_TEST_DIR/Mail/context  -a  -f $MH_TEST_DIR/Mail/.mh_profile ]; then
+if [ -f $MH_TEST_DIR/Mail/context  -a  -f "$MH" ]; then
   run_prog install-mh -check
 else
   failed=`expr ${failed:-0} + 1`
@@ -61,7 +61,7 @@ fi
 rm -rf $MH_TEST_DIR/Mail
 HOME=$MH_TEST_DIR install-mh -auto >/dev/null
 
-if [ -f $MH_TEST_DIR/Mail/context  -a  -f $MH_TEST_DIR/Mail/.mh_profile ]; then
+if [ -f $MH_TEST_DIR/Mail/context  -a  -f "$MH" ]; then
   run_prog install-mh -check
 else
   failed=`expr ${failed:-0} + 1`

diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index 0dd8e2b..96160c0 100755 (executable)
--- a/test/mhparam/test-mhparam
+++ b/test/mhparam/test-mhparam
@@ -47,7 +47,7 @@ esac
 run_test 'mhparam -nonexistent' 'mhparam: -nonexistent unknown'
 
 # check -all
-cp $MH_TEST_DIR/Mail/.mh_profile $expected
+cp "$MH" $expected
 # -all adds current folder
 echo 'Current-Folder: '`folder -f` >>$expected
 run_prog mhparam -all >$actual
@@ -69,7 +69,7 @@ check $expected_err $actual_err
 run_test 'mhparam path' "$MH_TEST_DIR/Mail"
 
 # check more than one component, which enables -component
-echo 'AliasFile: aliases' >>"$MH_TEST_DIR/Mail/.mh_profile"
+echo 'AliasFile: aliases' >>"$MH"
 run_test 'mhparam path AliasFile' "path: $MH_TEST_DIR/Mail
 AliasFile: aliases"
 

diff --git a/test/mhshow/test-charset b/test/mhshow/test-charset
index d3e7354..83363da 100755 (executable)
--- a/test/mhshow/test-charset
+++ b/test/mhshow/test-charset
@@ -19,7 +19,7 @@ setup_test
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
 
-echo 'mhshow-charset-windows-1252: echo "This is a test"' >> $MH_TEST_DIR/Mail/.mh_profile
+echo 'mhshow-charset-windows-1252: echo "This is a test"' >> "$MH"
 
 # Write message with bogus quoted-printable data.
 msgfile=`mhpath new`

diff --git a/test/sequences/test-flist b/test/sequences/test-flist
index b897037..ca56eb1 100755 (executable)
--- a/test/sequences/test-flist
+++ b/test/sequences/test-flist
@@ -53,7 +53,7 @@ other+ has  4 in sequence unseen; out of  4
 other+ has  0 in sequence odd   ; out of  4'
 
 # Test Flist-Order with -noalpha.
-echo 'Flist-Order: o* i*' >> $MH_TEST_DIR/Mail/.mh_profile
+echo 'Flist-Order: o* i*' >> "$MH"
 run_test 'flists -seq unseen -seq odd -noalpha' \
          'other+ has  4 in sequence unseen; out of  4
 other+ has  0 in sequence odd   ; out of  4