Don't need to `else' after done() at end of then-block.

[nmh] / test / folder / test-packf

diff --git a/test/folder/test-packf b/test/folder/test-packf
index fac1a25133840c180fb22735bdf8bc7a40dc857a..a839dc8efdb4b37796cd29b6c6737e0f32eb0650 100755 (executable)
--- a/test/folder/test-packf
+++ b/test/folder/test-packf
@@ -16,7 +16,7 @@ fi
 
 setup_test
 
-! packf - >/dev/null 2>&1 # gcov
+check_exit '-eq 1' packf -
 
 expected="$MH_TEST_DIR/$$.expected"
 actual="$MH_TEST_DIR/$$.actual"
@@ -53,7 +53,7 @@ printf 'y\n' >Mail/yes
 # check with no switches
 run_prog packf <Mail/yes
 inc +inbox2 -file msgbox <Mail/yes >/dev/null
-rm -f msgbox .msgbox.map
+rm -f msgbox
 for i in `pick +inbox`; do
   diff "`mhpath +inbox $i`" "`mhpath +inbox2 $i`"
 done
@@ -63,7 +63,7 @@ rmm +inbox2 -unlink `pick +inbox2`
 # check +folder
 run_prog packf +inbox <Mail/yes
 inc +inbox2 -file msgbox >/dev/null
-rm -f msgbox .msgbox.map
+rm -f msgbox
 for i in `pick +inbox`; do
   diff "`mhpath +inbox $i`" "`mhpath +inbox2 $i`"
 done
@@ -73,7 +73,7 @@ rmm +inbox2 -unlink `pick +inbox2`
 # check msgs
 run_prog packf +inbox 1 2 3 <Mail/yes
 inc +inbox2 -file msgbox >/dev/null
-rm -f msgbox .msgbox.map
+rm -f msgbox
 for i in `pick +inbox2`; do
   diff "`mhpath +inbox $i`" "`mhpath +inbox2 $i`"
 done
@@ -92,7 +92,7 @@ rmm +inbox2 -unlink `pick +inbox2`
 # check append to existing mbox file
 run_prog packf +inbox -file msgbox2 <Mail/yes
 inc +inbox2 -file msgbox2 >/dev/null
-rm -f msgbox2 .msgbox2.map
+rm -f msgbox2
 for i in `pick +inbox2`; do
   if [ $i -le 10 ]; then
     diff "`mhpath +inbox $i`" "`mhpath +inbox2 $i`"
@@ -107,7 +107,7 @@ rmm +inbox2 -unlink `pick +inbox2`
 # check -mbox
 run_prog packf +inbox -mbox <Mail/yes
 inc +inbox2 -file msgbox >/dev/null
-rm -f msgbox .msgbox.map
+rm -f msgbox
 for i in `pick +inbox2`; do
   diff "`mhpath +inbox $i`" "`mhpath +inbox2 $i`"
 done
@@ -117,7 +117,7 @@ rmm +inbox2 -unlink `pick +inbox2`
 # check -mmdf
 run_prog packf +inbox -mmdf <Mail/yes
 inc +inbox2 -file msgbox >/dev/null
-rm -f msgbox .msgbox.map
+rm -f msgbox
 for i in `pick +inbox2`; do
   diff "`mhpath +inbox $i`" "`mhpath +inbox2 $i`"
 done
@@ -127,7 +127,7 @@ rmm +inbox2 -unlink `pick +inbox2`
 # check append to existing mmdf file
 run_prog packf +inbox -mmdf <Mail/yes
 inc +inbox2 -file msgbox >/dev/null
-rm -f msgbox .msgbox.map
+rm -f msgbox
 for i in `pick +inbox2`; do
   if [ $i -le 10 ]; then
     diff "`mhpath +inbox $i`" "`mhpath +inbox2 $i`"