X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/26ac907a39f8711907707d53050c2f950a47242f..HEAD:/test/rcv/test-rcvtty

diff --git a/test/rcv/test-rcvtty b/test/rcv/test-rcvtty
index 6d61de21..d86b8dbf 100755
--- a/test/rcv/test-rcvtty
+++ b/test/rcv/test-rcvtty
@@ -17,13 +17,16 @@ fi
 setup_test
 
 # Use proper program, likely not the first one on PATH.
-rcvtty="${MH_LIB_DIR}/rcvtty"
+rcvtty="${MH_LIBEXEC_DIR}/rcvtty"
+
+check_exit '-eq 1' $rcvtty -
 
 expected="$MH_TEST_DIR/$$.expected"
 actual="$MH_TEST_DIR/$$.actual"
 
 
 # check -help
+start_test "-help"
 cat >"$expected" <<EOF
 Usage: rcvtty [command ...]
   switches are:
@@ -37,25 +40,29 @@ Usage: rcvtty [command ...]
   -help
 EOF
 
-$rcvtty -help >"$actual" 2>&1
+#### Skip nmh intro text.
+run_prog "$rcvtty" -help 2>&1 | sed '/^$/,$d' >"$actual"
 check "$expected" "$actual"
 
 # check -version
+start_test "-version"
 case `$rcvtty -v` in
   rcvtty\ --*) ;;
-  *          ) printf "$0: rcvtty -v generated unexpected output\n" >&2
+  *          ) printf '%s: rcvtty -v generated unexpected output\n' "$0" >&2
                failed=`expr ${failed:-0} + 1`;;
 esac
 
 # check normal operation.  Use -biff to avoid sending notification to
+start_test "normal operation.  Use -biff to avoid sending notification to"
 # each of the user's terminals.  So this command shouldn't do
 # anything.  It will write the notification(s) if the user actually
 # has actually enabled biff notification, or has set the exec bit of
 # any of their ttys.
 cat >"$expected" <<EOF
 EOF
-$rcvtty <${MH_TEST_DIR}/Mail/inbox/1 -biff >"$actual" 2>&1
+run_prog $rcvtty <${MH_TEST_DIR}/Mail/inbox/1 -biff >"$actual" 2>&1
 check "$expected" "$actual"
 
 
+finish_test
 exit ${failed:-0}