X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/13015c3c27462cb98027d644636ff526e10dd1d0..refs/heads/master:/test/inc/test-msgchk?ds=sidebyside

diff --git a/test/inc/test-msgchk b/test/inc/test-msgchk
index 4ac4554e..c3615543 100755
--- a/test/inc/test-msgchk
+++ b/test/inc/test-msgchk
@@ -27,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
@@ -41,10 +42,11 @@ Usage: msgchk [switches] [users ...]
   -help
 EOF
 
-run_prog 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
@@ -52,9 +54,11 @@ 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.,
@@ -63,6 +67,7 @@ run_test 'msgchk' "You don't have any mail waiting"
   "${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
@@ -71,6 +76,7 @@ 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
@@ -80,45 +86,59 @@ run_prog msgchk -nodate -date | sed -e 's/last read on.*/last read on/' \
 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' ''
 
 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}