X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/46f35e659f3bc3e808a70263bea0ec72624c8a08..ec173fd2c:/test/rcv/test-rcvstore?ds=sidebyside diff --git a/test/rcv/test-rcvstore b/test/rcv/test-rcvstore index 9656f373..d2844df0 100755 --- a/test/rcv/test-rcvstore +++ b/test/rcv/test-rcvstore @@ -19,6 +19,8 @@ setup_test # Use proper program, likely not the first one on PATH. rcvstore="${MH_LIBEXEC_DIR}/rcvstore" +check_exit '-eq 1' $rcvstore - + expected=$MH_TEST_DIR/$$.expected expected_err=$MH_TEST_DIR/$$.expected_err actual=$MH_TEST_DIR/$$.actual @@ -38,8 +40,9 @@ Usage: rcvstore [+folder] [switches] -help EOF -run_prog $rcvstore -help >$actual 2>&1 -check $expected $actual +#### Skip nmh intro text. +run_prog "$rcvstore" -help 2>&1 | sed '/^$/,$d' >"$actual" +check "$expected" "$actual" # check -version case `$rcvstore -v` in @@ -180,12 +183,10 @@ if [ "`find ${MH_TEST_DIR}/Mail/test-read-perms -perm 600`"x = ''x ]; then if [ ${failed:-0} -eq 0 ]; then echo "$Test $0 SKIP (cannot remove read permission on plain files)" exit 77 - else - exit $failed fi -else - rm -f ${MH_TEST_DIR}/Mail/test-read-perms + exit $failed fi +rm -f ${MH_TEST_DIR}/Mail/test-read-perms # check default Msg-Protect msgprot=`mhparam msgprot`