Okay, fixed a few more things. Almost there?

[nmh] / test / rcv / test-rcvstore

diff --git a/test/rcv/test-rcvstore b/test/rcv/test-rcvstore
index 0493bc2ba857621b4ed3a34e946b5d599d39e7ac..9656f373ee93db5a278c2ef17e6a06c45ef17db4 100755 (executable)
--- a/test/rcv/test-rcvstore
+++ b/test/rcv/test-rcvstore
@@ -17,7 +17,7 @@ fi
 setup_test
 
 # Use proper program, likely not the first one on PATH.
-rcvstore="${MH_LIB_DIR}/rcvstore"
+rcvstore="${MH_LIBEXEC_DIR}/rcvstore"
 
 expected=$MH_TEST_DIR/$$.expected
 expected_err=$MH_TEST_DIR/$$.expected_err
@@ -38,14 +38,14 @@ Usage: rcvstore [+folder] [switches]
   -help
 EOF
 
-$rcvstore -help >$actual 2>&1
+run_prog $rcvstore -help >$actual 2>&1
 check $expected $actual
 
 # check -version
 case `$rcvstore -v` in
   rcvstore\ --*) ;;
-  *           ) printf "$0: rcvstore -v generated unexpected output\n" >&2
-                failed=`expr ${failed:-0} + 1`;;
+  *            ) printf '%s: rcvstore -v generated unexpected output\n' "$0" >&2
+                 failed=`expr ${failed:-0} + 1`;;
 esac
 
 # check unknown switch
@@ -56,23 +56,23 @@ cat >$expected <<EOF
 rcvstore: empty file
 EOF
 
-$rcvstore </dev/null >$actual 2>&1
+run_prog $rcvstore </dev/null >$actual 2>&1
 check $expected $actual
 
 # check with no switches
 cat >$expected <<EOF
 EOF
-$rcvstore <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
+run_prog $rcvstore <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
 check $expected $actual 'keep first'
 check "${MH_TEST_DIR}/Mail/inbox/1" "${MH_TEST_DIR}/Mail/inbox/11" 'keep first'
 
 # check + of existing folder
-$rcvstore +inbox <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
+run_prog $rcvstore +inbox <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
 check $expected $actual 'keep first'
 check "${MH_TEST_DIR}/Mail/inbox/1" "${MH_TEST_DIR}/Mail/inbox/11" 'keep first'
 
 # check + of new folder
-$rcvstore +newfolder <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
+run_prog $rcvstore +newfolder <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
 check $expected $actual 'keep first'
 check "${MH_TEST_DIR}/Mail/inbox/1" "${MH_TEST_DIR}/Mail/newfolder/1" \
   'keep first'
@@ -84,14 +84,14 @@ rcvstore: folder ${MH_TEST_DIR}/Mail/newfolder doesn't exist
 EOF
 
 set +e
-$rcvstore +newfolder -nocreate <${MH_TEST_DIR}/Mail/inbox/1 >$actual \
+run_prog $rcvstore +newfolder -nocreate <${MH_TEST_DIR}/Mail/inbox/1 >$actual \
   2>$actual_err
 set -e
 check $expected $actual 'keep first'
 check $expected_err $actual_err
 
 # check -create
-$rcvstore +newfolder -nocreate -create <${MH_TEST_DIR}/Mail/inbox/1 \
+run_prog $rcvstore +newfolder -nocreate -create <${MH_TEST_DIR}/Mail/inbox/1 \
   >$actual 2>&1
 check $expected $actual 'keep first'
 check "${MH_TEST_DIR}/Mail/inbox/1" "${MH_TEST_DIR}/Mail/newfolder/1" \
@@ -100,7 +100,7 @@ rmdir "${MH_TEST_DIR}/Mail/newfolder"
 
 # check addition to unseen sequence
 printf 'Unseen-Sequence: unseen\n' >> $MH
-$rcvstore <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
+run_prog $rcvstore <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
 check $expected $actual 'keep first'
 run_test 'mark -sequence unseen -list' 'unseen: 11'
 check "${MH_TEST_DIR}/Mail/inbox/1" "${MH_TEST_DIR}/Mail/inbox/11" 'keep first'
@@ -109,59 +109,62 @@ touch "${MH_TEST_DIR}/Mail/inbox/11"
 rmm 11
 
 # check -nounseen
-$rcvstore -nounseen <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
+run_prog $rcvstore -nounseen <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
 check $expected $actual 'keep first'
 run_test 'mark -sequence unseen -list' 'unseen: '
 check "${MH_TEST_DIR}/Mail/inbox/1" "${MH_TEST_DIR}/Mail/inbox/11" 'keep first'
 
 # check -unseen
-$rcvstore -nounseen -unseen <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
+run_prog $rcvstore -nounseen -unseen <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
 check $expected $actual 'keep first'
 run_test 'mark -sequence unseen -list' 'unseen: 11'
 check "${MH_TEST_DIR}/Mail/inbox/1" "${MH_TEST_DIR}/Mail/inbox/11" 'keep first'
 
 # check -sequence
-$rcvstore -sequence newseq <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
+run_prog $rcvstore -sequence newseq <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
 check $expected $actual 'keep first'
 run_test 'mark -sequence newseq -list' 'newseq: 11'
 check "${MH_TEST_DIR}/Mail/inbox/1" "${MH_TEST_DIR}/Mail/inbox/11" 'keep first'
 
 # check that default is -nozero
 mark -sequence newseq all
-$rcvstore -sequence newseq <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
+run_prog $rcvstore -sequence newseq <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
 check $expected $actual 'keep first'
 run_test 'mark -sequence newseq -list' 'newseq: 1-11'
 check "${MH_TEST_DIR}/Mail/inbox/1" "${MH_TEST_DIR}/Mail/inbox/11" 'keep first'
 
 # check -zero
 mark -sequence newseq all
-$rcvstore -sequence newseq -zero <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
+run_prog $rcvstore -sequence newseq -zero \
+  <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
 check $expected $actual 'keep first'
 run_test 'mark -sequence newseq -list' 'newseq: 11'
 check "${MH_TEST_DIR}/Mail/inbox/1" "${MH_TEST_DIR}/Mail/inbox/11" 'keep first'
 
 # check -nozero
 mark -sequence newseq all
-$rcvstore -seq newseq -zero -nozero <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
+run_prog $rcvstore -seq newseq -zero -nozero \
+  <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
 check $expected $actual 'keep first'
 run_test 'mark -sequence newseq -list' 'newseq: 1-11'
 check "${MH_TEST_DIR}/Mail/inbox/1" "${MH_TEST_DIR}/Mail/inbox/11" 'keep first'
 
 # check that default is -public
-$rcvstore -sequence pubseq <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
+run_prog $rcvstore -sequence pubseq <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
 check $expected $actual 'keep first'
 run_test 'mark -sequence pubseq -list' 'pubseq: 11'
 check "${MH_TEST_DIR}/Mail/inbox/1" "${MH_TEST_DIR}/Mail/inbox/11" 'keep first'
 
 # check -nopublic
-$rcvstore -sequence privseq -nopublic <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
+run_prog $rcvstore -sequence privseq -nopublic \
+  <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
 check $expected $actual 'keep first'
 run_test 'mark -sequence privseq -nopublic -list' 'privseq (private): 11'
 check "${MH_TEST_DIR}/Mail/inbox/1" "${MH_TEST_DIR}/Mail/inbox/11" 'keep first'
 
 # check -public
-$rcvstore -sequence pubseq -nopublic -public <${MH_TEST_DIR}/Mail/inbox/1 \
-  >$actual 2>&1
+run_prog $rcvstore -sequence pubseq -nopublic -public \
+  <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
 check $expected $actual 'keep first'
 run_test 'mark -sequence pubseq -public -list' 'pubseq: 11'
 check "${MH_TEST_DIR}/Mail/inbox/1" "${MH_TEST_DIR}/Mail/inbox/11" 'keep first'
@@ -186,7 +189,7 @@ fi
 
 # check default Msg-Protect
 msgprot=`mhparam msgprot`
-$rcvstore <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
+run_prog $rcvstore <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
 check $expected $actual 'keep first'
 run_test "find ${MH_TEST_DIR}/Mail/inbox/11 -perm $msgprot" \
   "${MH_TEST_DIR}/Mail/inbox/11"
@@ -194,8 +197,8 @@ check "${MH_TEST_DIR}/Mail/inbox/1" "${MH_TEST_DIR}/Mail/inbox/11" 'keep first'
 
 # check Msg-Protect profile entry
 msgprot=640
-printf "Msg-Protect: $msgprot\n" >>$MH
-$rcvstore <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
+printf 'Msg-Protect: %s\n' "$msgprot" >>$MH
+run_prog $rcvstore <${MH_TEST_DIR}/Mail/inbox/1 >$actual 2>&1
 check $expected $actual
 run_test "find ${MH_TEST_DIR}/Mail/inbox/11 -perm $msgprot" \
   "${MH_TEST_DIR}/Mail/inbox/11"