X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Frcv%2Ftest-rcvpack;h=51deed7728f203dd47a5e4b17c27cf9ddfdde431;hb=d63aff26a21021822af6cfa3fbacc572f2b6869f;hp=9433a378dd135aa93c63e6c8a512276cc4606849;hpb=1ae96ed565c1bb0ae054f81b47bf960d2b62e658;p=mmh

diff --git a/test/rcv/test-rcvpack b/test/rcv/test-rcvpack
index 9433a37..51deed7 100755
--- a/test/rcv/test-rcvpack
+++ b/test/rcv/test-rcvpack
@@ -19,14 +19,12 @@ setup_test
 # Use proper program, likely not the first one on PATH.
 rcvpack="${MH_LIB_DIR}/rcvpack"
 
-expected=$MH_TEST_DIR/$$.expected
-expected_err=$MH_TEST_DIR/$$.expected_err
-actual=$MH_TEST_DIR/$$.actual
-actual_err=$MH_TEST_DIR/$$.actual_err
+expected="$MH_TEST_DIR/$$.expected"
+actual="$MH_TEST_DIR/$$.actual"
 
 
 # check -help
-cat >$expected <<EOF
+cat >"$expected" <<EOF
 Usage: rcvpack [switches] file
   switches are:
   -mbox
@@ -35,13 +33,13 @@ Usage: rcvpack [switches] file
   -help
 EOF
 
-$rcvpack -help >$actual 2>&1
-check $expected $actual
+$rcvpack -help >"$actual" 2>&1
+check "$expected" "$actual"
 
 # check -version
 case `$rcvpack -v` in
   rcvpack\ --*) ;;
-  *           ) printf "$0: rcvpack -v generated unexpected output\n" >&2
+  *           ) printf '%s: rcvpack -v generated unexpected output\n' "$0" >&2
                 failed=`expr ${failed:-0} + 1`;;
 esac
 
@@ -58,7 +56,10 @@ check "${MH_TEST_DIR}/Mail/inbox/1" "${MH_TEST_DIR}/Mail/inbox/11" 'keep first'
 
 # check -mbox
 $rcvpack -mmdf -mbox <${MH_TEST_DIR}/Mail/inbox/1 ${MH_TEST_DIR}/Mail/mbox2
-check "${MH_TEST_DIR}/Mail/mbox" "${MH_TEST_DIR}/Mail/mbox2" 'keep first'
+# Filter out "From " lines because their timestamps can differ by a second.
+grep -v '^From ' "${MH_TEST_DIR}/Mail/mbox" >"${MH_TEST_DIR}/Mail/mbox-filt"
+grep -v '^From ' "${MH_TEST_DIR}/Mail/mbox2" >"${MH_TEST_DIR}/Mail/mbox2-filt"
+check "${MH_TEST_DIR}/Mail/mbox-filt" "${MH_TEST_DIR}/Mail/mbox2-filt"
 
 # check append to existing mbox file
 $rcvpack <${MH_TEST_DIR}/Mail/inbox/2 ${MH_TEST_DIR}/Mail/mbox