X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fpost%2Ftest-post-common.sh;h=3b1a3d0b9b99840281dd997a42774f61a2f56374;hb=492101aee1185135f239b3aabd5b2494f748c931;hp=856c399f4e83751bec0a8ba91f553fa8ecba9b5e;hpb=a3bf69c3a988b0de2126fbfe6804c61ef24a8896;p=mmh

diff --git a/test/post/test-post-common.sh b/test/post/test-post-common.sh
index 856c399..3b1a3d0 100755
--- a/test/post/test-post-common.sh
+++ b/test/post/test-post-common.sh
@@ -21,15 +21,14 @@ echo "clientname: nosuchhost.example.com" >> ${MHMTSCONF}
 #
 # One "post" test run.  Ok, yeah, we're using "send", but that's just
 # because it's easier.
-#
+# $1: output filename for fakesmtp, i.e., the sent message
+# $2: expected output
+# $3: optional switches for send
 
 test_post ()
-{ "${MH_OBJ_DIR}/test/fakesmtp" "$1" $localport &
-    pid="$!"
-
-    send -draft -server 127.0.0.1 -port $localport || exit 1
+{ pid=`"${MH_OBJ_DIR}/test/fakesmtp" "$1" $localport`
 
-    wait ${pid}
+    send -draft -server 127.0.0.1 -port $localport $3 || exit 1
 
     #
     # It's hard to calculate the exact Date: header post is going to
@@ -38,7 +37,7 @@ test_post ()
     #
 
     sed -e 's/^Date:.*/Date:/' "$1" > "$1".nodate
-    mv "$1".nodate "$1"
+    rm -f "$1"
 
-    check "$1" "$2"
+    check "$1".nodate "$2"
 }