X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/4c9ad9f4f44521d7eae9ea1e8277cf7f8b577d20..HEAD:/test/install-mh/test-install-mh?ds=inline

diff --git a/test/install-mh/test-install-mh b/test/install-mh/test-install-mh
index 5a939617..7afe64b4 100755
--- a/test/install-mh/test-install-mh
+++ b/test/install-mh/test-install-mh
@@ -16,41 +16,48 @@ 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
-install-mh -check
+run_prog install-mh -check
 run_test "echo $?" '0'
 
 # Remove the nmh installation so that install-mh can install.
 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
-install-mh -check
+run_prog install-mh -check
 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
 n
 n
 $installpath
-y" | install-mh >/dev/null
+y" | run_prog install-mh >/dev/null
 
-if [ -f $MH_TEST_DIR/Mail/context  -a  -f $MH_TEST_DIR/Mail/.mh_profile ]; then
-  install-mh -check
+if [ -f $MH_TEST_DIR/Mail/context  -a  -f "$MH" ]; then
+  run_prog install-mh -check
 else
   failed=`expr ${failed:-0} + 1`
 fi
@@ -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
-  install-mh -check
+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