X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/58e2db8c886765caf1ce294ba8336fe683bcd888..1e18bf0ab892a2ae9d3151c248b652898f7d7116:/test/forw/test-forw-digest

diff --git a/test/forw/test-forw-digest b/test/forw/test-forw-digest
index 8bdc9494..6037a203 100755
--- a/test/forw/test-forw-digest
+++ b/test/forw/test-forw-digest
@@ -24,7 +24,7 @@ cc4="CC User Four <ccuserfour@example.com>"
 fcc1="+nosuchmailbox"
 fcc2="+nosuchmailbox2"
 
-digestdate=$(date "+%A, %d %b %G")
+digestdate=`date "+%A, %e %b %Y"`
 
 cat > "$expected" <<EOF
 From:     ${from}
@@ -50,14 +50,14 @@ EOF
 i=1
 while [ "$i" -le 6 ]
 do
-    filename=$(mhpath +inbox $i)
+    filename=`mhpath +inbox $i`
     cat $filename >> "$expected"
     cat >> "$expected" <<EOF
 
 ------------------------------
 
 EOF
-    i=$(expr $i + 1)
+    i=`expr $i + 1`
 done
 
 cat >> "$expected" <<EOF
@@ -65,13 +65,15 @@ End of digest-test Digest [Volume 2 Issue 3]
 ********************************************
 EOF
 
-forw -editor true -from "${from}" -to "${to1}" -to "${to2}" \
+run_prog forw -editor true -from "${from}" -to "${to1}" -to "${to2}" \
     -cc "${cc1}" -cc "${cc2}" -cc "${cc3}" -cc "${cc4}" -fcc "${fcc1}" \
     -fcc "${fcc2}" -width 60 -issue 3 -volume 2 -nowhatnowproc \
     -digest digest-test +inbox 1-6 || exit 1
 
 check "${expected}" "${actual}"
 
+rm -f "${actual}"
+
 #
 # Once more, but taking some of the defaults
 #
@@ -94,14 +96,14 @@ EOF
 i=7
 while [ "$i" -le 8 ]
 do
-    filename=$(mhpath +inbox $i)
+    filename=`mhpath +inbox $i`
     cat $filename >> "$expected"
     cat >> "$expected" <<EOF
 
 ------------------------------
 
 EOF
-    i=$(expr $i + 1)
+    i=`expr $i + 1`
 done
 
 cat >> "$expected" <<EOF
@@ -109,7 +111,7 @@ End of digest-test Digest [Volume 2 Issue 4]
 ********************************************
 EOF
 
-forw -editor true -from "${from}" -nowhatnowproc -digest digest-test \
+run_prog forw -editor true -from "${from}" -nowhatnowproc -digest digest-test \
     -subject "This is a test" +inbox 7-8 || exit 1
 
 check "${expected}" "${actual}"