Expanded allowed text in mhical parse error message.

[nmh] / test / install-mh / test-install-mh

diff --git a/test/install-mh/test-install-mh b/test/install-mh/test-install-mh
index 9798e5ede843be2a906bb2016af355b25afd3c91..7afe64b484de1a3706b596cfd81cc8f501560ba0 100755 (executable)
--- a/test/install-mh/test-install-mh
+++ b/test/install-mh/test-install-mh
@@ -16,14 +16,19 @@ fi
 
 setup_test
 
+check_exit '-eq 1' install-mh -
+
 # check with no options, with nmh already installed
+start_test "with no options, with nmh already installed"
 run_test "install-mh" \
     'install-mh: You already have an nmh profile, use an editor to modify it'
 
 # check -auto, with nmh already installed
+start_test "-auto, with nmh already installed"
 run_test "install-mh -auto" 'install-mh: invocation error'
 
 # check -check, with nmh already installed
+start_test "-check, with nmh already installed"
 run_test "install-mh -check" ''
 # make sure exit status is 0
 run_prog install-mh -check
@@ -33,6 +38,7 @@ run_test "echo $?" '0'
 rm -rf $MH_TEST_DIR/Mail
 
 # check -check, with nmh not installed
+start_test "-check, with nmh not installed"
 run_test "install-mh -check" ''
 # make sure exit status is 1
 set +e
@@ -41,6 +47,7 @@ run_test "echo $?" '1'
 set -e
 
 # check with no options, with nmh not installed.  Use canned
+start_test "with no options, with nmh not installed.  Use canned"
 # responses to install.
 installpath=`echo $MH_TEST_DIR/Mail | sed 's%^/%%'`
 echo "n
@@ -49,7 +56,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,11 +68,12 @@ 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`
 fi
 
 
+finish_test
 exit $failed