X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0f0af4e32a4d734209c16282b63f7cb1094e2699..403805faa7a8564c103801891b5abf33974767ad:/test/inc/test-msgchk

diff --git a/test/inc/test-msgchk b/test/inc/test-msgchk
index c6850d99..c3615543 100755
--- a/test/inc/test-msgchk
+++ b/test/inc/test-msgchk
@@ -18,6 +18,8 @@ fi
 
 setup_test
 
+check_exit '-eq 1' msgchk -
+
 expected=$MH_TEST_DIR/$$.expected
 expected_err=$MH_TEST_DIR/$$.expected_err
 actual=$MH_TEST_DIR/$$.actual
@@ -25,6 +27,7 @@ actual_err=$MH_TEST_DIR/$$.actual_err
 
 
 # check -help
+start_test "-help"
 # Only look at first 9 lines because the rest depend on
 # whether sasl support was configured in.
 cat >"$expected" <<EOF
@@ -39,10 +42,11 @@ Usage: msgchk [switches] [users ...]
   -help
 EOF
 
-msgchk -help | head -9 >"$actual" 2>&1
+run_prog msgchk -help 2>&1 | head -9 >"$actual"
 check "$expected" "$actual"
 
 # check -version
+start_test "-version"
 case `msgchk -v` in
   msgchk\ --*) ;;
   *          ) printf '%s: msgchk -v generated unexpected output\n' "$0" >&2
@@ -50,72 +54,91 @@ case `msgchk -v` in
 esac
 
 # check unknown switch
+start_test "unknown switch"
 run_test "msgchk -nonexistent" 'msgchk: -nonexistent unknown'
 
 # check with no arguments and no mail waiting
+start_test "with no arguments and no mail waiting"
 run_test 'msgchk' "You don't have any mail waiting"
 
 # Use maildrop specified in mts.conf, i.e.,
 # ${MH_TEST_DIR}/Mail/maildrop, which should not yet exist.
-"${MH_LIB_DIR}"/rcvpack <"${MH_TEST_DIR}"/Mail/inbox/1 \
+"${MH_LIBEXEC_DIR}"/rcvpack <"${MH_TEST_DIR}"/Mail/inbox/1 \
   "${MH_TEST_DIR}"/Mail/maildrop
 
 # check with no arguments and mail waiting
+start_test "with no arguments and mail waiting"
 cat >"$expected" <<EOF
 You have new mail waiting; last read on
 EOF
 
-msgchk | sed -e 's/last read on.*/last read on/' >"$actual"
+run_prog msgchk | sed -e 's/last read on.*/last read on/' >"$actual"
 check "$expected" "$actual"
 
 # check -date
+start_test "-date"
 cat >"$expected" <<EOF
 You have new mail waiting; last read on
 EOF
 
-msgchk -nodate -date | sed -e 's/last read on.*/last read on/' >"$actual"
+run_prog msgchk -nodate -date | sed -e 's/last read on.*/last read on/' \
+  >"$actual"
 check "$expected" "$actual"
 
 # check -nodate
+start_test "-nodate"
 run_test 'msgchk -nodate' 'You have new mail waiting'
 
 # check -notify mail, when there is mail
+start_test "-notify mail, when there is mail"
 run_test 'msgchk -notify mail -nodate' 'You have new mail waiting'
 
 # check -notify nomail, when there is mail
+start_test "-notify nomail, when there is mail"
 run_test 'msgchk -notify nomail -nodate' 'You have new mail waiting'
 
 # check -notify all, when there is mail
+start_test "-notify all, when there is mail"
 run_test 'msgchk -notify nomail -notify all -nodate' 'You have new mail waiting'
 
 # check -nonotify mail, when there is mail
+start_test "-nonotify mail, when there is mail"
 run_test 'msgchk -nonotify mail -nodate' ''
 
 # check -nonotify nomail, when there is mail
+start_test "-nonotify nomail, when there is mail"
 run_test 'msgchk -nonotify nomail -nodate' 'You have new mail waiting'
 
 # check -nonotify all, when there is mail
+start_test "-nonotify all, when there is mail"
 run_test 'msgchk -nonotify nomail -nonotify all -nodate' ''
 
-inc -silent
+run_prog inc -silent
 
 # check -notify mail, when there is no mail
+start_test "-notify mail, when there is no mail"
 run_test 'msgchk -notify mail -nodate' "You don't have any mail waiting"
 
 # check -notify nomail, when there is no mail
+start_test "-notify nomail, when there is no mail"
 run_test 'msgchk -notify nomail -nodate' "You don't have any mail waiting"
 
 # check -notify all, when there is no mail
+start_test "-notify all, when there is no mail"
 run_test 'msgchk -notify nomail -nonotify all -nodate' ''
 
 # check -nonotify mail, when there is no mail
+start_test "-nonotify mail, when there is no mail"
 run_test 'msgchk -nonotify mail -nodate' "You don't have any mail waiting"
 
 # check -nonotify nomail, when there is no mail
+start_test "-nonotify nomail, when there is no mail"
 run_test 'msgchk -nonotify nomail -nodate' ''
 
 # check -nonotify all, when there is no mail
+start_test "-nonotify all, when there is no mail"
 run_test 'msgchk -nonotify nomail -nonotify all -nodate' ''
 
 
+finish_test
 exit ${failed:-0}