X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/745756aab12a7fcab857deb6bf2d715364930071..7bb5dd523c67aabb2aa9cc623d69bc380862fc77:/test/folder/test-packf?ds=sidebyside

diff --git a/test/folder/test-packf b/test/folder/test-packf
index 758a2abb..4d4e4db1 100755
--- a/test/folder/test-packf
+++ b/test/folder/test-packf
@@ -31,14 +31,15 @@ Usage: packf [+folder] [msgs] [switches]
   -help
 EOF
 
-packf -help >"$actual" 2>&1
+#### Skip nmh intro text.
+packf -help | sed '/^$/,$d' >"$actual" 2>&1
 check "$expected" "$actual"
 
 # check -version
 case `packf -v` in
   packf\ --*) ;;
-  *           ) printf "$0: packf -v generated unexpected output\n" >&2
-                failed=`expr ${failed:-0} + 1`;;
+  *         ) printf '%s: packf -v generated unexpected output\n' "$0" >&2
+              failed=`expr ${failed:-0} + 1`;;
 esac
 
 # check unknown switch
@@ -48,7 +49,7 @@ cd "${MH_TEST_DIR}"  ||  exit 1
 printf 'y\n' >Mail/yes
 
 # check with no switches
-packf <Mail/yes
+run_prog packf <Mail/yes
 inc +inbox2 -file msgbox <Mail/yes >/dev/null
 rm -f msgbox .msgbox.map
 for i in `pick +inbox`; do
@@ -58,7 +59,7 @@ run_test "printf $i" '10'
 rmm +inbox2 -unlink `pick +inbox2`
 
 # check +folder
-packf +inbox <Mail/yes
+run_prog packf +inbox <Mail/yes
 inc +inbox2 -file msgbox >/dev/null
 rm -f msgbox .msgbox.map
 for i in `pick +inbox`; do
@@ -68,7 +69,7 @@ run_test "printf $i" '10'
 rmm +inbox2 -unlink `pick +inbox2`
 
 # check msgs
-packf +inbox 1 2 3 <Mail/yes
+run_prog packf +inbox 1 2 3 <Mail/yes
 inc +inbox2 -file msgbox >/dev/null
 rm -f msgbox .msgbox.map
 for i in `pick +inbox2`; do
@@ -78,7 +79,7 @@ run_test "printf $i" '3'
 rmm +inbox2 -unlink `pick +inbox2`
 
 # check -file
-packf +inbox -file msgbox2 <Mail/yes
+run_prog packf +inbox -file msgbox2 <Mail/yes
 inc +inbox2 -file msgbox2 >/dev/null
 for i in `pick +inbox2`; do
   diff "`mhpath +inbox $i`" "`mhpath +inbox2 $i`"
@@ -87,7 +88,7 @@ run_test "printf $i" '10'
 rmm +inbox2 -unlink `pick +inbox2`
 
 # check append to existing mbox file
-packf +inbox -file msgbox2 <Mail/yes
+run_prog packf +inbox -file msgbox2 <Mail/yes
 inc +inbox2 -file msgbox2 >/dev/null
 rm -f msgbox2 .msgbox2.map
 for i in `pick +inbox2`; do
@@ -102,7 +103,7 @@ run_test "printf $i" '20'
 rmm +inbox2 -unlink `pick +inbox2`
 
 # check -mbox
-packf +inbox -mbox <Mail/yes
+run_prog packf +inbox -mbox <Mail/yes
 inc +inbox2 -file msgbox >/dev/null
 rm -f msgbox .msgbox.map
 for i in `pick +inbox2`; do
@@ -112,7 +113,7 @@ run_test "printf $i" '10'
 rmm +inbox2 -unlink `pick +inbox2`
 
 # check -mmdf
-packf +inbox -mmdf <Mail/yes
+run_prog packf +inbox -mmdf <Mail/yes
 inc +inbox2 -file msgbox >/dev/null
 rm -f msgbox .msgbox.map
 for i in `pick +inbox2`; do
@@ -122,7 +123,7 @@ run_test "printf $i" '10'
 rmm +inbox2 -unlink `pick +inbox2`
 
 # check append to existing mmdf file
-packf +inbox -mmdf <Mail/yes
+run_prog packf +inbox -mmdf <Mail/yes
 inc +inbox2 -file msgbox >/dev/null
 rm -f msgbox .msgbox.map
 for i in `pick +inbox2`; do