X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9383ac2311caa190a93fd6694c6c82390cabf044..7540f02725475698a47046ebf4e55b3e8dea5ab6:/test/rcv/test-rcvpack?ds=inline

diff --git a/test/rcv/test-rcvpack b/test/rcv/test-rcvpack
index b39ceaf0..d52361ba 100755
--- a/test/rcv/test-rcvpack
+++ b/test/rcv/test-rcvpack
@@ -19,11 +19,14 @@ setup_test
 # Use proper program, likely not the first one on PATH.
 rcvpack="${MH_LIBEXEC_DIR}/rcvpack"
 
+check_exit '-eq 1' $rcvpack -
+
 expected="$MH_TEST_DIR/$$.expected"
 actual="$MH_TEST_DIR/$$.actual"
 
 
 # check -help
+start_test "-help"
 cat >"$expected" <<EOF
 Usage: rcvpack [switches] file
   switches are:
@@ -34,10 +37,11 @@ Usage: rcvpack [switches] file
 EOF
 
 #### Skip nmh intro text.
-run_prog "$rcvpack" -help | sed '/^$/,$d' >"$actual" 2>&1
+run_prog "$rcvpack" -help 2>&1 | sed '/^$/,$d' >"$actual"
 check "$expected" "$actual"
 
 # check -version
+start_test "-version"
 case `$rcvpack -v` in
   rcvpack\ --*) ;;
   *           ) printf '%s: rcvpack -v generated unexpected output\n' "$0" >&2
@@ -45,17 +49,21 @@ case `$rcvpack -v` in
 esac
 
 # check unknown switch
+start_test "unknown switch"
 run_test "$rcvpack -nonexistent" 'rcvpack: -nonexistent unknown'
 
 # check with no switches
+start_test "with no switches"
 run_test "$rcvpack" 'rcvpack: rcvpack [switches] file'
 
 # check mbox creation
+start_test "mbox creation"
 run_prog $rcvpack <${MH_TEST_DIR}/Mail/inbox/1 ${MH_TEST_DIR}/Mail/mbox
 inc -file ${MH_TEST_DIR}/Mail/mbox -silent
 check "${MH_TEST_DIR}/Mail/inbox/1" "${MH_TEST_DIR}/Mail/inbox/11" 'keep first'
 
 # check -mbox
+start_test "-mbox"
 run_prog $rcvpack -mmdf -mbox ${MH_TEST_DIR}/Mail/mbox2 \
   <${MH_TEST_DIR}/Mail/inbox/1
 # Filter out "From " lines because their timestamps can differ by a second.
@@ -64,19 +72,23 @@ grep -v '^From ' "${MH_TEST_DIR}/Mail/mbox2" >"${MH_TEST_DIR}/Mail/mbox2-filt"
 check "${MH_TEST_DIR}/Mail/mbox-filt" "${MH_TEST_DIR}/Mail/mbox2-filt"
 
 # check append to existing mbox file
+start_test "append to existing mbox file"
 run_prog $rcvpack <${MH_TEST_DIR}/Mail/inbox/2 ${MH_TEST_DIR}/Mail/mbox
 inc -file ${MH_TEST_DIR}/Mail/mbox -silent
 check "${MH_TEST_DIR}/Mail/inbox/2" "${MH_TEST_DIR}/Mail/inbox/12" 'keep first'
 
 # check -mmdf
+start_test "-mmdf"
 run_prog $rcvpack -mmdf <${MH_TEST_DIR}/Mail/inbox/3 ${MH_TEST_DIR}/Mail/mmdf
 inc -file ${MH_TEST_DIR}/Mail/mmdf -silent
 check "${MH_TEST_DIR}/Mail/inbox/3" "${MH_TEST_DIR}/Mail/inbox/12" 'keep first'
 
 # check append to existing mmdf file
+start_test "append to existing mmdf file"
 run_prog $rcvpack -mmdf <${MH_TEST_DIR}/Mail/inbox/4 ${MH_TEST_DIR}/Mail/mmdf
 inc -file ${MH_TEST_DIR}/Mail/mmdf -silent
 check "${MH_TEST_DIR}/Mail/inbox/4" "${MH_TEST_DIR}/Mail/inbox/13" 'keep first'
 
 
+finish_test
 exit ${failed:-0}