Removed mhmail.c because it was no longer needed and could get in

[mmh] / test / forw / test-forw-digest

diff --git a/test/forw/test-forw-digest b/test/forw/test-forw-digest
index 6792a78..ff39ddd 100755 (executable)
--- a/test/forw/test-forw-digest
+++ b/test/forw/test-forw-digest
@@ -14,17 +14,17 @@ setup_test
 
 expected="${MH_TEST_DIR}/$$.expected"
 actual="${MH_TEST_DIR}/Mail/draft"
-from="Mr Test User <test@user.com>"
-to1="User One <userone@test.com>"
-to2="User Two <usertwo@test.com>"
-cc1="CC User One <ccuserone@test.com>"
-cc2="CC User Two <ccusertwo@test.com>"
-cc3="CC User Three <ccuserthree@test.com>"
-cc4="CC User Four <ccuserfour@test.com>"
+from="Mr Test User <test@example.com>"
+to1="User One <userone@example.com>"
+to2="User Two <usertwo@example.com>"
+cc1="CC User One <ccuserone@example.com>"
+cc2="CC User Two <ccusertwo@example.com>"
+cc3="CC User Three <ccuserthree@example.com>"
+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
@@ -72,6 +72,8 @@ forw -editor true -from "${from}" -to "${to1}" -to "${to2}" \
 
 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