Fixed test-mkstemp to work with valgrind.

[nmh] / test / inc / test-msgchk

diff --git a/test/inc/test-msgchk b/test/inc/test-msgchk
index 4145230684458682c50c2dfa528eb5feaa404cd3..066058b836e00c073df1fd81336b24ae01b061ea 100755 (executable)
--- a/test/inc/test-msgchk
+++ b/test/inc/test-msgchk
@@ -39,13 +39,13 @@ Usage: msgchk [switches] [users ...]
   -help
 EOF
 
   -help
 EOF
 

-msgchk -help | head -9 >"$actual" 2>&1
+run_prog msgchk -help | head -9 >"$actual" 2>&1

 check "$expected" "$actual"
 
 # check -version
 case `msgchk -v` in
   msgchk\ --*) ;;
 check "$expected" "$actual"
 
 # check -version
 case `msgchk -v` in
   msgchk\ --*) ;;

-  *          ) printf "$0: msgchk -v generated unexpected output\n" >&2
+  *          ) printf '%s: msgchk -v generated unexpected output\n' "$0" >&2

                failed=`expr ${failed:-0} + 1`;;
 esac
 
                failed=`expr ${failed:-0} + 1`;;
 esac
 


@@ -65,7 +65,7 @@ cat >"$expected" <<EOF
 You have new mail waiting; last read on
 EOF
 
 You have new mail waiting; last read on
 EOF
 

-msgchk | sed -e 's/last read on.*/last read on/' >"$actual"
+run_prog msgchk | sed -e 's/last read on.*/last read on/' >"$actual"

 check "$expected" "$actual"
 
 # check -date
 check "$expected" "$actual"
 
 # check -date


@@ -73,7 +73,8 @@ cat >"$expected" <<EOF
 You have new mail waiting; last read on
 EOF
 
 You have new mail waiting; last read on
 EOF
 

-msgchk -nodate -date | sed -e 's/last read on.*/last read on/' >"$actual"
+run_prog msgchk -nodate -date | sed -e 's/last read on.*/last read on/' \
+  >"$actual"

 check "$expected" "$actual"
 
 # check -nodate
 check "$expected" "$actual"
 
 # check -nodate


@@ -97,7 +98,7 @@ run_test 'msgchk -nonotify nomail -nodate' 'You have new mail waiting'
 # check -nonotify all, when there is mail
 run_test 'msgchk -nonotify nomail -nonotify all -nodate' ''
 
 # check -nonotify all, when there is mail
 run_test 'msgchk -nonotify nomail -nonotify all -nodate' ''
 

-inc -silent
+run_prog inc -silent

 
 # check -notify mail, when there is no mail
 run_test 'msgchk -notify mail -nodate' "You don't have any mail waiting"
 
 # check -notify mail, when there is no mail
 run_test 'msgchk -notify mail -nodate' "You don't have any mail waiting"