From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Mon, 31 Oct 2016 17:44:24 +0000 (+0000)
Subject: Use new check_exit in `# gcov' tests.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/db3da5fe01f937010afb1ac4a7129b345f1cf5a2

Use new check_exit in `# gcov' tests.

It showed up fmtdump wasn't being found because $? was 127, not 1.
And mkstemp exits 255 on error, unusually amongst MH commands.
---

diff --git a/test/ali/test-ali b/test/ali/test-ali
index 4c3ef4ca..008782d2 100755
--- a/test/ali/test-ali
+++ b/test/ali/test-ali
@@ -19,7 +19,7 @@ fi
 
 setup_test
 
-ali - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' ali - # 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 f47ae2de..a7755ed7 100755
--- a/test/anno/test-anno
+++ b/test/anno/test-anno
@@ -16,7 +16,7 @@ fi
 
 setup_test
 
-anno - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' anno - # 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 ed237477..23cfa73b 100755
--- a/test/burst/test-burst
+++ b/test/burst/test-burst
@@ -12,7 +12,7 @@ fi
 
 setup_test
 
-burst - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' burst - # gcov
 
 #
 # Create a test message that we can burst
diff --git a/test/comp/test-comp-format b/test/comp/test-comp-format
index 34c9cb98..f991b3c6 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 || true  # gcov
+check_exit '-eq 1' comp - # 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 450a7a39..8039fa77 100755
--- a/test/dist/test-dist
+++ b/test/dist/test-dist
@@ -16,7 +16,7 @@ fi
 
 setup_test
 
-dist - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' dist - # 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 1e341bb1..f4f2d435 100755
--- a/test/folder/test-packf
+++ b/test/folder/test-packf
@@ -16,7 +16,7 @@ fi
 
 setup_test
 
-packf - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' packf - # gcov
 
 expected="$MH_TEST_DIR/$$.expected"
 actual="$MH_TEST_DIR/$$.actual"
diff --git a/test/folder/test-sortm b/test/folder/test-sortm
index 142f5225..7f3a6514 100755
--- a/test/folder/test-sortm
+++ b/test/folder/test-sortm
@@ -16,7 +16,7 @@ fi
 
 setup_test
 
-sortm - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' sortm - # gcov
 
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
diff --git a/test/format/test-fmtdump b/test/format/test-fmtdump
index 0c966c84..f919b0a3 100755
--- a/test/format/test-fmtdump
+++ b/test/format/test-fmtdump
@@ -16,11 +16,11 @@ fi
 
 setup_test
 
-fmtdump - >/dev/null 2>&1 || true  # gcov
-
 # Use proper program, likely not the first one on PATH.
 fmtdump="${MH_LIBEXEC_DIR}/fmtdump"
 
+check_exit '-eq 1' "$fmtdump" - # gcov
+
 expected=$MH_TEST_DIR/$$.expected
 expected_err=$MH_TEST_DIR/$$.expected_err
 actual=$MH_TEST_DIR/$$.actual
diff --git a/test/inc/test-msgchk b/test/inc/test-msgchk
index a20180d5..24bfdcfd 100755
--- a/test/inc/test-msgchk
+++ b/test/inc/test-msgchk
@@ -18,7 +18,7 @@ fi
 
 setup_test
 
-msgchk - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' msgchk - # 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 561f3c1a..5aafd9e8 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 || true  # gcov
+check_exit '-eq 1' install-mh - # 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 251f3466..a0f85679 100755
--- a/test/mhbuild/test-forw
+++ b/test/mhbuild/test-forw
@@ -14,7 +14,7 @@ fi
 
 setup_test
 
-forw - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' forw - # gcov
 
 # Make a draft file forwarding two messages.
 mkdraft() {
diff --git a/test/mhbuild/test-header-encode b/test/mhbuild/test-header-encode
index 8c2564b9..3a0dcb9b 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 || true  # gcov
+check_exit '-eq 1' mhbuild -h # gcov
 
 testname="${MH_TEST_DIR}/$$"
 backupname="${MH_TEST_DIR}/`mhparam sbackup`$$"
diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg
index fdc6ece3..b3177dbc 100755
--- a/test/mhfixmsg/test-mhfixmsg
+++ b/test/mhfixmsg/test-mhfixmsg
@@ -16,7 +16,7 @@ fi
 
 setup_test
 
-mhfixmsg - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' mhfixmsg - # 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 edb78a24..072f2c32 100755
--- a/test/mhical/test-mhical
+++ b/test/mhical/test-mhical
@@ -16,7 +16,7 @@ fi
 
 setup_test
 
-mhical - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' mhical - # 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 0fe40059..eb5e527b 100755
--- a/test/mhlist/test-mhlist
+++ b/test/mhlist/test-mhlist
@@ -16,7 +16,7 @@ fi
 
 setup_test
 
-mhlist - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' mhlist - # gcov
 
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam
index d838d688..994619b0 100755
--- a/test/mhparam/test-mhparam
+++ b/test/mhparam/test-mhparam
@@ -16,8 +16,8 @@ fi
 
 setup_test
 
-mhparam - >/dev/null 2>&1 || true  # gcov
-mhparam localmbox >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' mhparam - # gcov
+check_exit '-eq 0' mhparam localmbox # 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 dcd15fc3..aab7ecbc 100755
--- a/test/mhpath/test-mhpath
+++ b/test/mhpath/test-mhpath
@@ -16,7 +16,7 @@ fi
 
 setup_test
 
-mhpath - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' mhpath - # gcov
 
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
diff --git a/test/mhshow/test-charset b/test/mhshow/test-charset
index 0320d143..92d8a968 100755
--- a/test/mhshow/test-charset
+++ b/test/mhshow/test-charset
@@ -16,7 +16,7 @@ fi
 
 setup_test
 
-mhshow - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' mhshow - # 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 3db1176e..61593d34 100755
--- a/test/mhstore/test-mhstore
+++ b/test/mhstore/test-mhstore
@@ -16,7 +16,7 @@ fi
 
 setup_test
 
-mhstore - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' mhstore - # 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 afeb2c52..59cacad1 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 || true  # gcov
+check_exit '-eq 255' $mkstemp - # 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 dfe4e371..9eb4a652 100755
--- a/test/new/test-basic
+++ b/test/new/test-basic
@@ -14,7 +14,7 @@ fi
 
 setup_test
 
-folder - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' folder - # gcov
 
 folders=$MH_TEST_DIR/Mail/.folders
 
diff --git a/test/oauth/test-inc b/test/oauth/test-inc
index 3965e15f..38e25f6f 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 || true  # gcov
+check_exit '-eq 1' inc - # gcov
 
 setup_pop
 
diff --git a/test/oauth/test-mhlogin b/test/oauth/test-mhlogin
index 16e3f902..f55673ee 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 || true  # gcov
+check_exit '-eq 1' mhlogin - # gcov
 
 expect_no_creds() {
     cat /dev/null > "${MHTMPDIR}/$$.expected-creds"
diff --git a/test/oauth/test-send b/test/oauth/test-send
index cbac5d08..7fa7bfb1 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 || true  # gcov
+check_exit '-eq 1' send - # gcov
 
 test_send_only_fakehttp() {
     start_fakehttp
diff --git a/test/post/test-post-basic b/test/post/test-post-basic
index 23534fc0..126a6a40 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 || true  # gcov
+check_exit '-eq 1' "$MH_LIBEXEC_DIR/post" - # gcov
 
 #
 # Basic test - Simple message, single user, single recipient.  Note that
diff --git a/test/prompter/test-prompter b/test/prompter/test-prompter
index f36c0d81..2b3ad1ca 100755
--- a/test/prompter/test-prompter
+++ b/test/prompter/test-prompter
@@ -16,7 +16,7 @@ fi
 
 setup_test
 
-prompter - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' prompter - # 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 f11da72d..8583444b 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 || true  # gcov
+check_exit '-eq 1' $rcvdist - # gcov
 
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
diff --git a/test/rcv/test-rcvpack b/test/rcv/test-rcvpack
index d15e047d..3f306bac 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 || true  # gcov
+check_exit '-eq 1' $rcvpack - # gcov
 
 expected="$MH_TEST_DIR/$$.expected"
 actual="$MH_TEST_DIR/$$.actual"
diff --git a/test/rcv/test-rcvstore b/test/rcv/test-rcvstore
index 54ce6e48..7d88faa9 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 || true  # gcov
+check_exit '-eq 1' $rcvstore - # 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 4cef2b81..541a1866 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 || true  # gcov
+check_exit '-eq 1' $rcvtty - # gcov
 
 expected="$MH_TEST_DIR/$$.expected"
 actual="$MH_TEST_DIR/$$.actual"
diff --git a/test/refile/test-refile b/test/refile/test-refile
index 15f04768..e3888434 100755
--- a/test/refile/test-refile
+++ b/test/refile/test-refile
@@ -16,7 +16,7 @@ fi
 
 setup_test
 
-refile - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' refile - # gcov
 
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
diff --git a/test/repl/test-repl b/test/repl/test-repl
index 350428d1..7de80246 100755
--- a/test/repl/test-repl
+++ b/test/repl/test-repl
@@ -19,7 +19,7 @@ fi
 
 setup_test
 
-repl - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' repl - # 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 60acab00..070e9faf 100755
--- a/test/scan/test-scan
+++ b/test/scan/test-scan
@@ -14,7 +14,7 @@ fi
 
 setup_test
 
-scan - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' scan - # gcov
 
 expected="$MH_TEST_DIR/$$.expected"
 actual="$MH_TEST_DIR/$$.actual"
diff --git a/test/sequences/test-flist b/test/sequences/test-flist
index d6ee7c11..037272d7 100755
--- a/test/sequences/test-flist
+++ b/test/sequences/test-flist
@@ -16,7 +16,7 @@ fi
 
 setup_test
 
-flist - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' flist - # 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 e98f1f8d..83199239 100755
--- a/test/sequences/test-mark
+++ b/test/sequences/test-mark
@@ -16,7 +16,7 @@ fi
 
 setup_test
 
-mark - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' mark - # 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 d6c2d9be..07050fa3 100755
--- a/test/show/test-show
+++ b/test/show/test-show
@@ -9,7 +9,7 @@ fi
 
 setup_test
 
-show - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' show - # gcov
 
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
diff --git a/test/slocal/test-slocal b/test/slocal/test-slocal
index 6468de51..6924d7bc 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 || true  # gcov
+check_exit '-eq 1' $slocal - # gcov
 
 expected="$MH_TEST_DIR"/$$.expected
 actual="$MH_TEST_DIR"/$$.actual
diff --git a/test/whom/test-whom b/test/whom/test-whom
index 8a5a656e..537fc2dc 100755
--- a/test/whom/test-whom
+++ b/test/whom/test-whom
@@ -19,7 +19,7 @@ fi
 
 setup_test
 
-whom - >/dev/null 2>&1 || true  # gcov
+check_exit '-eq 1' whom - # gcov
 
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual