From: David Levine Date: Mon, 31 Oct 2016 15:39:11 +0000 (-0400) Subject: Replaced use of ! with || true, for ultimate Bourne shell compatiblity. X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/b7cbd7c8a39920669db61d331b12839f2a2d3562?hp=3ab1e9323e964d5377952a2b666ce91bab39c45a Replaced use of ! with || true, for ultimate Bourne shell compatiblity. Update to commit c3ba36f92bcbf44e071961f3d0bb5e6ddab317d6. --- diff --git a/test/ali/test-ali b/test/ali/test-ali index a7ef48e4..4c3ef4ca 100755 --- a/test/ali/test-ali +++ b/test/ali/test-ali @@ -19,7 +19,7 @@ fi setup_test -! ali - >/dev/null 2>&1 # gcov +ali - >/dev/null 2>&1 || true # gcov expected=$MH_TEST_DIR/$$.expected expected_err=$MH_TEST_DIR/$$.expected_err diff --git a/test/anno/test-anno b/test/anno/test-anno index f00dde0d..f47ae2de 100755 --- a/test/anno/test-anno +++ b/test/anno/test-anno @@ -16,7 +16,7 @@ fi setup_test -! anno - >/dev/null 2>&1 # gcov +anno - >/dev/null 2>&1 || true # gcov expected=$MH_TEST_DIR/$$.expected expected_err=$MH_TEST_DIR/$$.expected_err diff --git a/test/burst/test-burst b/test/burst/test-burst index d541e220..ed237477 100755 --- a/test/burst/test-burst +++ b/test/burst/test-burst @@ -12,7 +12,7 @@ fi setup_test -! burst - >/dev/null 2>&1 # gcov +burst - >/dev/null 2>&1 || true # gcov # # Create a test message that we can burst diff --git a/test/comp/test-comp-format b/test/comp/test-comp-format index 3e101924..34c9cb98 100755 --- a/test/comp/test-comp-format +++ b/test/comp/test-comp-format @@ -13,7 +13,7 @@ fi setup_test -! comp - >/dev/null 2>&1 # gcov +comp - >/dev/null 2>&1 || true # gcov # # Create a test template file (we create one here just in case the master diff --git a/test/dist/test-dist b/test/dist/test-dist index 6f73555d..450a7a39 100755 --- a/test/dist/test-dist +++ b/test/dist/test-dist @@ -16,7 +16,7 @@ fi setup_test -! dist - >/dev/null 2>&1 # gcov +dist - >/dev/null 2>&1 || true # gcov expected=$MH_TEST_DIR/$$.expected expected_err=$MH_TEST_DIR/$$.expected_err diff --git a/test/folder/test-packf b/test/folder/test-packf index fac1a251..1e341bb1 100755 --- a/test/folder/test-packf +++ b/test/folder/test-packf @@ -16,7 +16,7 @@ fi setup_test -! packf - >/dev/null 2>&1 # gcov +packf - >/dev/null 2>&1 || true # gcov expected="$MH_TEST_DIR/$$.expected" actual="$MH_TEST_DIR/$$.actual" diff --git a/test/folder/test-sortm b/test/folder/test-sortm index d31eeb16..142f5225 100755 --- a/test/folder/test-sortm +++ b/test/folder/test-sortm @@ -16,7 +16,7 @@ fi setup_test -! sortm - >/dev/null 2>&1 # gcov +sortm - >/dev/null 2>&1 || true # gcov expected=$MH_TEST_DIR/$$.expected actual=$MH_TEST_DIR/$$.actual diff --git a/test/format/test-fmtdump b/test/format/test-fmtdump index 86adb7a9..0c966c84 100755 --- a/test/format/test-fmtdump +++ b/test/format/test-fmtdump @@ -16,7 +16,7 @@ fi setup_test -! fmtdump - >/dev/null 2>&1 # gcov +fmtdump - >/dev/null 2>&1 || true # gcov # Use proper program, likely not the first one on PATH. fmtdump="${MH_LIBEXEC_DIR}/fmtdump" diff --git a/test/inc/test-msgchk b/test/inc/test-msgchk index f191265e..a20180d5 100755 --- a/test/inc/test-msgchk +++ b/test/inc/test-msgchk @@ -18,7 +18,7 @@ fi setup_test -! msgchk - >/dev/null 2>&1 # gcov +msgchk - >/dev/null 2>&1 || true # gcov expected=$MH_TEST_DIR/$$.expected expected_err=$MH_TEST_DIR/$$.expected_err diff --git a/test/install-mh/test-install-mh b/test/install-mh/test-install-mh index 5cd0bbf2..561f3c1a 100755 --- a/test/install-mh/test-install-mh +++ b/test/install-mh/test-install-mh @@ -16,7 +16,7 @@ fi setup_test -! install-mh - >/dev/null 2>&1 # gcov +install-mh - >/dev/null 2>&1 || true # gcov # check with no options, with nmh already installed run_test "install-mh" \ diff --git a/test/mhbuild/test-forw b/test/mhbuild/test-forw index ae90c841..251f3466 100755 --- a/test/mhbuild/test-forw +++ b/test/mhbuild/test-forw @@ -14,7 +14,7 @@ fi setup_test -! forw - >/dev/null 2>&1 # gcov +forw - >/dev/null 2>&1 || true # gcov # Make a draft file forwarding two messages. mkdraft() { diff --git a/test/mhbuild/test-header-encode b/test/mhbuild/test-header-encode index d656d97e..8c2564b9 100755 --- a/test/mhbuild/test-header-encode +++ b/test/mhbuild/test-header-encode @@ -16,7 +16,7 @@ fi setup_test -! mhbuild -h >/dev/null 2>&1 # gcov +mhbuild -h >/dev/null 2>&1 || true # gcov testname="${MH_TEST_DIR}/$$" backupname="${MH_TEST_DIR}/`mhparam sbackup`$$" diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg index 6950c49b..fdc6ece3 100755 --- a/test/mhfixmsg/test-mhfixmsg +++ b/test/mhfixmsg/test-mhfixmsg @@ -16,7 +16,7 @@ fi setup_test -! mhfixmsg - >/dev/null 2>&1 # gcov +mhfixmsg - >/dev/null 2>&1 || true # gcov #### Make sure that html-to-text conversion is what we expect. require_locale en_US.UTF-8 en_US.UTF8 en_US.utf-8 en_US.utf8 diff --git a/test/mhical/test-mhical b/test/mhical/test-mhical index 087bfdc3..edb78a24 100755 --- a/test/mhical/test-mhical +++ b/test/mhical/test-mhical @@ -16,7 +16,7 @@ fi setup_test -! mhical - >/dev/null 2>&1 # gcov +mhical - >/dev/null 2>&1 || true # gcov #### Make sure that html-to-text conversion is what we expect. require_locale en_US.UTF-8 en_US.UTF8 en_US.utf-8 en_US.utf8 diff --git a/test/mhlist/test-mhlist b/test/mhlist/test-mhlist index 2da5220f..0fe40059 100755 --- a/test/mhlist/test-mhlist +++ b/test/mhlist/test-mhlist @@ -16,7 +16,7 @@ fi setup_test -! mhlist - >/dev/null 2>&1 # gcov +mhlist - >/dev/null 2>&1 || true # gcov expected=$MH_TEST_DIR/$$.expected actual=$MH_TEST_DIR/$$.actual diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam index 6bb0fa06..d838d688 100755 --- a/test/mhparam/test-mhparam +++ b/test/mhparam/test-mhparam @@ -16,8 +16,8 @@ fi setup_test -! mhparam - >/dev/null 2>&1 # gcov -! mhparam localmbox >/dev/null 2>&1 # gcov +mhparam - >/dev/null 2>&1 || true # gcov +mhparam localmbox >/dev/null 2>&1 || true # gcov expected=$MH_TEST_DIR/$$.expected expected_err=$MH_TEST_DIR/$$.expected_err diff --git a/test/mhpath/test-mhpath b/test/mhpath/test-mhpath index e50decc3..dcd15fc3 100755 --- a/test/mhpath/test-mhpath +++ b/test/mhpath/test-mhpath @@ -16,7 +16,7 @@ fi setup_test -! mhpath - >/dev/null 2>&1 # gcov +mhpath - >/dev/null 2>&1 || true # gcov expected=$MH_TEST_DIR/$$.expected actual=$MH_TEST_DIR/$$.actual diff --git a/test/mhshow/test-charset b/test/mhshow/test-charset index 581cca70..0320d143 100755 --- a/test/mhshow/test-charset +++ b/test/mhshow/test-charset @@ -16,7 +16,7 @@ fi setup_test -! mhshow - >/dev/null 2>&1 # gcov +mhshow - >/dev/null 2>&1 || true # gcov require_locale en_US.UTF-8 en_US.UTF8 en_US.utf-8 en_US.utf8 diff --git a/test/mhstore/test-mhstore b/test/mhstore/test-mhstore index 3c9126f6..3db1176e 100755 --- a/test/mhstore/test-mhstore +++ b/test/mhstore/test-mhstore @@ -16,7 +16,7 @@ fi setup_test -! mhstore - >/dev/null 2>&1 # gcov +mhstore - >/dev/null 2>&1 || true # gcov expected="$MH_TEST_DIR/test-mhstore$$.expected" expected2="$MH_TEST_DIR/test-mhstore$$.expected2" diff --git a/test/mkstemp/test-mkstemp b/test/mkstemp/test-mkstemp index d6b9b653..afeb2c52 100755 --- a/test/mkstemp/test-mkstemp +++ b/test/mkstemp/test-mkstemp @@ -21,7 +21,7 @@ actual="$MH_TEST_DIR"/$$.actual mkstemp="${MH_LIBEXEC_DIR}/mkstemp" -! $mkstemp - >/dev/null 2>&1 # gcov +$mkstemp - >/dev/null 2>&1 || true # gcov $mkstemp -help | grep suffix >/dev/null && has_mkstemps=1 || has_mkstemps=0 diff --git a/test/new/test-basic b/test/new/test-basic index 2370eee2..dfe4e371 100755 --- a/test/new/test-basic +++ b/test/new/test-basic @@ -14,7 +14,7 @@ fi setup_test -! folder - >/dev/null 2>&1 # gcov +folder - >/dev/null 2>&1 || true # gcov folders=$MH_TEST_DIR/Mail/.folders diff --git a/test/oauth/test-inc b/test/oauth/test-inc index 5c01651c..3965e15f 100755 --- a/test/oauth/test-inc +++ b/test/oauth/test-inc @@ -10,7 +10,7 @@ fi . "${srcdir}/test/oauth/common.sh" -! inc - >/dev/null 2>&1 # gcov +inc - >/dev/null 2>&1 || true # gcov setup_pop diff --git a/test/oauth/test-mhlogin b/test/oauth/test-mhlogin index 87b3b2c1..16e3f902 100755 --- a/test/oauth/test-mhlogin +++ b/test/oauth/test-mhlogin @@ -10,7 +10,7 @@ fi . "${srcdir}/test/oauth/common.sh" -! mhlogin - >/dev/null 2>&1 # gcov +mhlogin - >/dev/null 2>&1 || true # gcov expect_no_creds() { cat /dev/null > "${MHTMPDIR}/$$.expected-creds" diff --git a/test/oauth/test-send b/test/oauth/test-send index d648a960..cbac5d08 100755 --- a/test/oauth/test-send +++ b/test/oauth/test-send @@ -10,7 +10,7 @@ fi . "${srcdir}/test/oauth/common.sh" -! send - >/dev/null 2>&1 # gcov +send - >/dev/null 2>&1 || true # gcov test_send_only_fakehttp() { start_fakehttp diff --git a/test/post/test-post-basic b/test/post/test-post-basic index 5b2056cd..23534fc0 100755 --- a/test/post/test-post-basic +++ b/test/post/test-post-basic @@ -12,7 +12,7 @@ fi . "${srcdir}/test/post/test-post-common.sh" -! "${MH_LIBEXEC_DIR}/post" - >/dev/null 2>&1 # gcov +"${MH_LIBEXEC_DIR}/post" - >/dev/null 2>&1 || true # gcov # # Basic test - Simple message, single user, single recipient. Note that diff --git a/test/prompter/test-prompter b/test/prompter/test-prompter index f5dbce94..f36c0d81 100755 --- a/test/prompter/test-prompter +++ b/test/prompter/test-prompter @@ -16,7 +16,7 @@ fi setup_test -! prompter - >/dev/null 2>&1 # gcov +prompter - >/dev/null 2>&1 || true # gcov expected=$MH_TEST_DIR/$$.expected expected_err=$MH_TEST_DIR/$$.expected_err diff --git a/test/rcv/test-rcvdist b/test/rcv/test-rcvdist index 018a5aaa..f11da72d 100755 --- a/test/rcv/test-rcvdist +++ b/test/rcv/test-rcvdist @@ -19,7 +19,7 @@ setup_test # Use proper program, likely not the first one on PATH. rcvdist="${MH_LIBEXEC_DIR}/rcvdist" -! $rcvdist - >/dev/null 2>&1 # gcov +$rcvdist - >/dev/null 2>&1 || true # gcov expected=$MH_TEST_DIR/$$.expected actual=$MH_TEST_DIR/$$.actual diff --git a/test/rcv/test-rcvpack b/test/rcv/test-rcvpack index e3b13eda..d15e047d 100755 --- a/test/rcv/test-rcvpack +++ b/test/rcv/test-rcvpack @@ -19,7 +19,7 @@ setup_test # Use proper program, likely not the first one on PATH. rcvpack="${MH_LIBEXEC_DIR}/rcvpack" -! $rcvpack - >/dev/null 2>&1 # gcov +$rcvpack - >/dev/null 2>&1 || true # gcov expected="$MH_TEST_DIR/$$.expected" actual="$MH_TEST_DIR/$$.actual" diff --git a/test/rcv/test-rcvstore b/test/rcv/test-rcvstore index 27ce3f6b..54ce6e48 100755 --- a/test/rcv/test-rcvstore +++ b/test/rcv/test-rcvstore @@ -19,7 +19,7 @@ setup_test # Use proper program, likely not the first one on PATH. rcvstore="${MH_LIBEXEC_DIR}/rcvstore" -! $rcvstore - >/dev/null 2>&1 # gcov +$rcvstore - >/dev/null 2>&1 || true # gcov expected=$MH_TEST_DIR/$$.expected expected_err=$MH_TEST_DIR/$$.expected_err diff --git a/test/rcv/test-rcvtty b/test/rcv/test-rcvtty index c8c1c2e5..4cef2b81 100755 --- a/test/rcv/test-rcvtty +++ b/test/rcv/test-rcvtty @@ -19,7 +19,7 @@ setup_test # Use proper program, likely not the first one on PATH. rcvtty="${MH_LIBEXEC_DIR}/rcvtty" -! $rcvtty - >/dev/null 2>&1 # gcov +$rcvtty - >/dev/null 2>&1 || true # gcov expected="$MH_TEST_DIR/$$.expected" actual="$MH_TEST_DIR/$$.actual" diff --git a/test/refile/test-refile b/test/refile/test-refile index 4addd694..15f04768 100755 --- a/test/refile/test-refile +++ b/test/refile/test-refile @@ -16,7 +16,7 @@ fi setup_test -! refile - >/dev/null 2>&1 # gcov +refile - >/dev/null 2>&1 || true # gcov expected=$MH_TEST_DIR/$$.expected actual=$MH_TEST_DIR/$$.actual diff --git a/test/repl/test-repl b/test/repl/test-repl index af880771..350428d1 100755 --- a/test/repl/test-repl +++ b/test/repl/test-repl @@ -19,7 +19,7 @@ fi setup_test -! repl - >/dev/null 2>&1 # gcov +repl - >/dev/null 2>&1 || true # gcov expected=$MH_TEST_DIR/$$.expected actual=$MH_TEST_DIR/Mail/draft diff --git a/test/scan/test-scan b/test/scan/test-scan index 171a9e59..60acab00 100755 --- a/test/scan/test-scan +++ b/test/scan/test-scan @@ -14,7 +14,7 @@ fi setup_test -! scan - >/dev/null 2>&1 # gcov +scan - >/dev/null 2>&1 || true # gcov expected="$MH_TEST_DIR/$$.expected" actual="$MH_TEST_DIR/$$.actual" diff --git a/test/sequences/test-flist b/test/sequences/test-flist index 02ffad9d..d6ee7c11 100755 --- a/test/sequences/test-flist +++ b/test/sequences/test-flist @@ -16,7 +16,7 @@ fi setup_test -! flist - >/dev/null 2>&1 # gcov +flist - >/dev/null 2>&1 || true # gcov run_test 'mark 1 3 5 7 9 +inbox -sequence odd' '' run_test 'mark -s odd -list' 'odd: 1 3 5 7 9' diff --git a/test/sequences/test-mark b/test/sequences/test-mark index 026a537b..e98f1f8d 100755 --- a/test/sequences/test-mark +++ b/test/sequences/test-mark @@ -16,7 +16,7 @@ fi setup_test -! mark - >/dev/null 2>&1 # gcov +mark - >/dev/null 2>&1 || true # gcov # Test sequence creation. run_test 'mark 1 3 5 7 +inbox -sequence odd' '' diff --git a/test/show/test-show b/test/show/test-show index 60a98c3e..d6c2d9be 100755 --- a/test/show/test-show +++ b/test/show/test-show @@ -9,7 +9,7 @@ fi setup_test -! show - >/dev/null 2>&1 # gcov +show - >/dev/null 2>&1 || true # gcov expected=$MH_TEST_DIR/$$.expected actual=$MH_TEST_DIR/$$.actual diff --git a/test/slocal/test-slocal b/test/slocal/test-slocal index 21f3b354..6468de51 100755 --- a/test/slocal/test-slocal +++ b/test/slocal/test-slocal @@ -19,7 +19,7 @@ setup_test # Use proper program, maybe not the first one on PATH. slocal="$MH_LIBEXEC_DIR"/slocal -! $slocal - >/dev/null 2>&1 # gcov +$slocal - >/dev/null 2>&1 || true # gcov expected="$MH_TEST_DIR"/$$.expected actual="$MH_TEST_DIR"/$$.actual diff --git a/test/whom/test-whom b/test/whom/test-whom index d811528a..8a5a656e 100755 --- a/test/whom/test-whom +++ b/test/whom/test-whom @@ -19,7 +19,7 @@ fi setup_test -! whom - >/dev/null 2>&1 # gcov +whom - >/dev/null 2>&1 || true # gcov expected=$MH_TEST_DIR/$$.expected actual=$MH_TEST_DIR/$$.actual