From: Ralph Corderoy Date: Sun, 30 Oct 2016 20:41:29 +0000 (+0000) Subject: Get coverage of quite a few of the `ambiguous switch' case. X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/c3ba36f92bcbf44e071961f3d0bb5e6ddab317d6?ds=inline;hp=f7919e77bcc861e64c769363649d757c792e9d69 Get coverage of quite a few of the `ambiguous switch' case. Typically by adding a `foo -', discarding stdout and stderr, and expecting it to exit non-zero. A `# gcov' comment states its purpose, and makes it easier to see if they can be deleted in time as other coverage tests improve. --- diff --git a/test/ali/test-ali b/test/ali/test-ali index 41ddb956..a7ef48e4 100755 --- a/test/ali/test-ali +++ b/test/ali/test-ali @@ -19,6 +19,8 @@ fi setup_test +! ali - >/dev/null 2>&1 # gcov + expected=$MH_TEST_DIR/$$.expected expected_err=$MH_TEST_DIR/$$.expected_err actual=$MH_TEST_DIR/$$.actual diff --git a/test/anno/test-anno b/test/anno/test-anno index 3f8fe5b4..f00dde0d 100755 --- a/test/anno/test-anno +++ b/test/anno/test-anno @@ -16,6 +16,8 @@ fi setup_test +! anno - >/dev/null 2>&1 # gcov + expected=$MH_TEST_DIR/$$.expected expected_err=$MH_TEST_DIR/$$.expected_err actual=$MH_TEST_DIR/$$.actual diff --git a/test/burst/test-burst b/test/burst/test-burst index fce125fe..d541e220 100755 --- a/test/burst/test-burst +++ b/test/burst/test-burst @@ -12,6 +12,8 @@ fi setup_test +! burst - >/dev/null 2>&1 # gcov + # # Create a test message that we can burst # diff --git a/test/comp/test-comp-format b/test/comp/test-comp-format index f7186617..3e101924 100755 --- a/test/comp/test-comp-format +++ b/test/comp/test-comp-format @@ -13,6 +13,8 @@ fi setup_test +! comp - >/dev/null 2>&1 # gcov + # # Create a test template file (we create one here just in case the master # one changes) diff --git a/test/dist/test-dist b/test/dist/test-dist index fa00b4b3..6f73555d 100755 --- a/test/dist/test-dist +++ b/test/dist/test-dist @@ -16,6 +16,8 @@ fi setup_test +! dist - >/dev/null 2>&1 # gcov + expected=$MH_TEST_DIR/$$.expected expected_err=$MH_TEST_DIR/$$.expected_err actual=$MH_TEST_DIR/$$.actual diff --git a/test/folder/test-packf b/test/folder/test-packf index 4d4e4db1..fac1a251 100755 --- a/test/folder/test-packf +++ b/test/folder/test-packf @@ -16,6 +16,8 @@ fi setup_test +! packf - >/dev/null 2>&1 # gcov + expected="$MH_TEST_DIR/$$.expected" actual="$MH_TEST_DIR/$$.actual" diff --git a/test/folder/test-sortm b/test/folder/test-sortm index e6c73bae..d31eeb16 100755 --- a/test/folder/test-sortm +++ b/test/folder/test-sortm @@ -16,6 +16,8 @@ fi setup_test +! sortm - >/dev/null 2>&1 # gcov + expected=$MH_TEST_DIR/$$.expected actual=$MH_TEST_DIR/$$.actual diff --git a/test/format/test-fmtdump b/test/format/test-fmtdump index 259e12a2..86adb7a9 100755 --- a/test/format/test-fmtdump +++ b/test/format/test-fmtdump @@ -16,6 +16,8 @@ fi setup_test +! fmtdump - >/dev/null 2>&1 # 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 09b261bc..f191265e 100755 --- a/test/inc/test-msgchk +++ b/test/inc/test-msgchk @@ -18,6 +18,8 @@ fi setup_test +! msgchk - >/dev/null 2>&1 # gcov + expected=$MH_TEST_DIR/$$.expected expected_err=$MH_TEST_DIR/$$.expected_err actual=$MH_TEST_DIR/$$.actual diff --git a/test/install-mh/test-install-mh b/test/install-mh/test-install-mh index 46d01cd4..5cd0bbf2 100755 --- a/test/install-mh/test-install-mh +++ b/test/install-mh/test-install-mh @@ -16,6 +16,8 @@ fi setup_test +! install-mh - >/dev/null 2>&1 # gcov + # check with no options, with nmh already installed run_test "install-mh" \ 'install-mh: You already have an nmh profile, use an editor to modify it' diff --git a/test/mhbuild/test-forw b/test/mhbuild/test-forw index 771bec0e..ae90c841 100755 --- a/test/mhbuild/test-forw +++ b/test/mhbuild/test-forw @@ -14,6 +14,8 @@ fi setup_test +! forw - >/dev/null 2>&1 # gcov + # Make a draft file forwarding two messages. mkdraft() { cat > $draft </dev/null 2>&1 # gcov + testname="${MH_TEST_DIR}/$$" backupname="${MH_TEST_DIR}/`mhparam sbackup`$$" diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg index 8d7a3a85..6950c49b 100755 --- a/test/mhfixmsg/test-mhfixmsg +++ b/test/mhfixmsg/test-mhfixmsg @@ -16,6 +16,8 @@ fi setup_test +! mhfixmsg - >/dev/null 2>&1 # 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 c8b09207..087bfdc3 100755 --- a/test/mhical/test-mhical +++ b/test/mhical/test-mhical @@ -16,6 +16,8 @@ fi setup_test +! mhical - >/dev/null 2>&1 # 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 e5fc895c..2da5220f 100755 --- a/test/mhlist/test-mhlist +++ b/test/mhlist/test-mhlist @@ -16,6 +16,8 @@ fi setup_test +! mhlist - >/dev/null 2>&1 # gcov + expected=$MH_TEST_DIR/$$.expected actual=$MH_TEST_DIR/$$.actual diff --git a/test/mhparam/test-mhparam b/test/mhparam/test-mhparam index 83b8407e..cc5778e2 100755 --- a/test/mhparam/test-mhparam +++ b/test/mhparam/test-mhparam @@ -16,6 +16,8 @@ fi setup_test +! mhparam - >/dev/null 2>&1 # gcov + expected=$MH_TEST_DIR/$$.expected expected_err=$MH_TEST_DIR/$$.expected_err actual=$MH_TEST_DIR/$$.actual diff --git a/test/mhpath/test-mhpath b/test/mhpath/test-mhpath index b92e85e5..e50decc3 100755 --- a/test/mhpath/test-mhpath +++ b/test/mhpath/test-mhpath @@ -16,6 +16,8 @@ fi setup_test +! mhpath - >/dev/null 2>&1 # gcov + expected=$MH_TEST_DIR/$$.expected actual=$MH_TEST_DIR/$$.actual diff --git a/test/mhshow/test-charset b/test/mhshow/test-charset index 52a75c51..581cca70 100755 --- a/test/mhshow/test-charset +++ b/test/mhshow/test-charset @@ -16,6 +16,8 @@ fi setup_test +! mhshow - >/dev/null 2>&1 # gcov + require_locale en_US.UTF-8 en_US.UTF8 en_US.utf-8 en_US.utf8 test "$ICONV_ENABLED" -eq 0 && text_size=10 || text_size=11 diff --git a/test/mhstore/test-mhstore b/test/mhstore/test-mhstore index 630b059f..3c9126f6 100755 --- a/test/mhstore/test-mhstore +++ b/test/mhstore/test-mhstore @@ -16,6 +16,8 @@ fi setup_test +! mhstore - >/dev/null 2>&1 # gcov + expected="$MH_TEST_DIR/test-mhstore$$.expected" expected2="$MH_TEST_DIR/test-mhstore$$.expected2" expected_err="$MH_TEST_DIR/test-mhmail$$.expected_err" diff --git a/test/mkstemp/test-mkstemp b/test/mkstemp/test-mkstemp index fcc8cd57..d6b9b653 100755 --- a/test/mkstemp/test-mkstemp +++ b/test/mkstemp/test-mkstemp @@ -20,6 +20,9 @@ expected="$MH_TEST_DIR"/$$.expected actual="$MH_TEST_DIR"/$$.actual mkstemp="${MH_LIBEXEC_DIR}/mkstemp" + +! $mkstemp - >/dev/null 2>&1 # gcov + $mkstemp -help | grep suffix >/dev/null && has_mkstemps=1 || has_mkstemps=0 cd "$MHTMPDIR" diff --git a/test/new/test-basic b/test/new/test-basic index 2fc34dbe..2370eee2 100755 --- a/test/new/test-basic +++ b/test/new/test-basic @@ -14,6 +14,8 @@ fi setup_test +! folder - >/dev/null 2>&1 # gcov + folders=$MH_TEST_DIR/Mail/.folders expected=$MH_TEST_DIR/$$.expected diff --git a/test/oauth/test-inc b/test/oauth/test-inc index 96a2af04..5c01651c 100755 --- a/test/oauth/test-inc +++ b/test/oauth/test-inc @@ -10,6 +10,8 @@ fi . "${srcdir}/test/oauth/common.sh" +! inc - >/dev/null 2>&1 # gcov + setup_pop # diff --git a/test/oauth/test-mhlogin b/test/oauth/test-mhlogin index 682fbc86..87b3b2c1 100755 --- a/test/oauth/test-mhlogin +++ b/test/oauth/test-mhlogin @@ -10,6 +10,8 @@ fi . "${srcdir}/test/oauth/common.sh" +! mhlogin - >/dev/null 2>&1 # gcov + expect_no_creds() { cat /dev/null > "${MHTMPDIR}/$$.expected-creds" cat /dev/null > "${MHTMPDIR}/oauth-test" diff --git a/test/oauth/test-send b/test/oauth/test-send index dc10080a..d648a960 100755 --- a/test/oauth/test-send +++ b/test/oauth/test-send @@ -10,6 +10,8 @@ fi . "${srcdir}/test/oauth/common.sh" +! send - >/dev/null 2>&1 # gcov + test_send_only_fakehttp() { start_fakehttp test_send_no_servers "$@" diff --git a/test/post/test-post-basic b/test/post/test-post-basic index c060a16e..5b2056cd 100755 --- a/test/post/test-post-basic +++ b/test/post/test-post-basic @@ -12,6 +12,8 @@ fi . "${srcdir}/test/post/test-post-common.sh" +! "${MH_LIBEXEC_DIR}/post" - >/dev/null 2>&1 # gcov + # # Basic test - Simple message, single user, single recipient. Note that # we test dot-stuffing here as well. diff --git a/test/prompter/test-prompter b/test/prompter/test-prompter index 1950903c..f5dbce94 100755 --- a/test/prompter/test-prompter +++ b/test/prompter/test-prompter @@ -16,6 +16,8 @@ fi setup_test +! prompter - >/dev/null 2>&1 # gcov + expected=$MH_TEST_DIR/$$.expected expected_err=$MH_TEST_DIR/$$.expected_err actual=$MH_TEST_DIR/$$.actual diff --git a/test/rcv/test-rcvdist b/test/rcv/test-rcvdist index 21d5904e..018a5aaa 100755 --- a/test/rcv/test-rcvdist +++ b/test/rcv/test-rcvdist @@ -19,6 +19,8 @@ setup_test # Use proper program, likely not the first one on PATH. rcvdist="${MH_LIBEXEC_DIR}/rcvdist" +! $rcvdist - >/dev/null 2>&1 # gcov + expected=$MH_TEST_DIR/$$.expected actual=$MH_TEST_DIR/$$.actual diff --git a/test/rcv/test-rcvpack b/test/rcv/test-rcvpack index b39ceaf0..e3b13eda 100755 --- a/test/rcv/test-rcvpack +++ b/test/rcv/test-rcvpack @@ -19,6 +19,8 @@ setup_test # Use proper program, likely not the first one on PATH. rcvpack="${MH_LIBEXEC_DIR}/rcvpack" +! $rcvpack - >/dev/null 2>&1 # gcov + expected="$MH_TEST_DIR/$$.expected" actual="$MH_TEST_DIR/$$.actual" diff --git a/test/rcv/test-rcvstore b/test/rcv/test-rcvstore index a49a3ccd..27ce3f6b 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" +! $rcvstore - >/dev/null 2>&1 # gcov + expected=$MH_TEST_DIR/$$.expected expected_err=$MH_TEST_DIR/$$.expected_err actual=$MH_TEST_DIR/$$.actual diff --git a/test/rcv/test-rcvtty b/test/rcv/test-rcvtty index 4f1d4988..c8c1c2e5 100755 --- a/test/rcv/test-rcvtty +++ b/test/rcv/test-rcvtty @@ -19,6 +19,8 @@ setup_test # Use proper program, likely not the first one on PATH. rcvtty="${MH_LIBEXEC_DIR}/rcvtty" +! $rcvtty - >/dev/null 2>&1 # gcov + expected="$MH_TEST_DIR/$$.expected" actual="$MH_TEST_DIR/$$.actual" diff --git a/test/refile/test-refile b/test/refile/test-refile index 64df564f..4addd694 100755 --- a/test/refile/test-refile +++ b/test/refile/test-refile @@ -16,6 +16,8 @@ fi setup_test +! refile - >/dev/null 2>&1 # gcov + expected=$MH_TEST_DIR/$$.expected actual=$MH_TEST_DIR/$$.actual diff --git a/test/repl/test-repl b/test/repl/test-repl index 3e014f6c..af880771 100755 --- a/test/repl/test-repl +++ b/test/repl/test-repl @@ -19,6 +19,8 @@ fi setup_test +! repl - >/dev/null 2>&1 # 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 1e600ec4..171a9e59 100755 --- a/test/scan/test-scan +++ b/test/scan/test-scan @@ -14,6 +14,8 @@ fi setup_test +! scan - >/dev/null 2>&1 # gcov + expected="$MH_TEST_DIR/$$.expected" actual="$MH_TEST_DIR/$$.actual" diff --git a/test/sequences/test-flist b/test/sequences/test-flist index ca56eb10..02ffad9d 100755 --- a/test/sequences/test-flist +++ b/test/sequences/test-flist @@ -16,6 +16,8 @@ fi setup_test +! flist - >/dev/null 2>&1 # gcov + run_test 'mark 1 3 5 7 9 +inbox -sequence odd' '' run_test 'mark -s odd -list' 'odd: 1 3 5 7 9' run_test 'mark +inbox -sequence unseen all' '' diff --git a/test/sequences/test-mark b/test/sequences/test-mark index f1d529e8..026a537b 100755 --- a/test/sequences/test-mark +++ b/test/sequences/test-mark @@ -16,6 +16,8 @@ fi setup_test +! mark - >/dev/null 2>&1 # gcov + # Test sequence creation. run_test 'mark 1 3 5 7 +inbox -sequence odd' '' run_test 'mark 2 4 6 8 10 +inbox -sequence even' '' diff --git a/test/show/test-show b/test/show/test-show index 15540945..60a98c3e 100755 --- a/test/show/test-show +++ b/test/show/test-show @@ -9,6 +9,8 @@ fi setup_test +! show - >/dev/null 2>&1 # gcov + expected=$MH_TEST_DIR/$$.expected actual=$MH_TEST_DIR/$$.actual diff --git a/test/slocal/test-slocal b/test/slocal/test-slocal index 394e1559..21f3b354 100755 --- a/test/slocal/test-slocal +++ b/test/slocal/test-slocal @@ -19,6 +19,8 @@ setup_test # Use proper program, maybe not the first one on PATH. slocal="$MH_LIBEXEC_DIR"/slocal +! $slocal - >/dev/null 2>&1 # gcov + expected="$MH_TEST_DIR"/$$.expected actual="$MH_TEST_DIR"/$$.actual actual2="$MH_TEST_DIR"/$$.actual2 diff --git a/test/whom/test-whom b/test/whom/test-whom index e7bd78f4..d811528a 100755 --- a/test/whom/test-whom +++ b/test/whom/test-whom @@ -19,6 +19,8 @@ fi setup_test +! whom - >/dev/null 2>&1 # gcov + expected=$MH_TEST_DIR/$$.expected actual=$MH_TEST_DIR/$$.actual