set -e
if test -z "${MH_OBJ_DIR}"; then
- srcdir=`dirname $0`/../..
- MH_OBJ_DIR=`cd $srcdir && pwd`; export MH_OBJ_DIR
+ srcdir=`dirname "$0"`/../..
+ MH_OBJ_DIR=`cd "$srcdir" && pwd`; export MH_OBJ_DIR
fi
. "$MH_OBJ_DIR/test/common.sh"
THISDIR="$srcdir/test/inc"
-if [ ! -z "$VALGRIND_ME" ]; then
+if [ -z "$VALGRIND_ME" ]; then
+ VALGRIND=
+else
require_prog valgrind
# Lack of quotes here is important
VALGRIND="valgrind --quiet --error-exitcode=1"
echo "Running tests under valgrind: takes ages!"
-else
- VALGRIND=
fi
# First check that all our various pieces of text are
# intact. (Since we're dealing in exact byte alignment
# minor corruptions such as line ending changes could
# render the tests useless.)
-(cd "$THISDIR" && output_md5 *.txt > "$MH_TEST_DIR/inctest.md5sums")
-diff -u "$THISDIR/md5sums" "$MH_TEST_DIR/inctest.md5sums"
+(cd "$THISDIR" && \
+ for i in *.txt; do
+ echo `output_md5 $i`' '"$i" >> "$MH_TEST_DIR/inctest.md5sums"
+ done)
+check "$THISDIR/md5sums" "$MH_TEST_DIR/inctest.md5sums" 'keep first'
FILLER="$THISDIR/filler.txt"
FROMLINE="$THISDIR/fromline.txt"
+MMDF_DELIM='printf "\01\01\01\01\012"'
HDR="$THISDIR/msgheader.txt"
-if grep -q From "$FILLER"; then
+if grep From "$FILLER" >/dev/null; then
echo "Somebody's messed with $FILLER -- it must not contain"
echo "anything that might look like a message delimiter!"
exit 1
# bigger as well.
STDIO_BUFSZ=16384
-FROMLINESZ="$(wc -c "$FROMLINE" | cut -d ' ' -f 1)"
-HDRSZ="$(wc -c "$HDR" | cut -d ' ' -f 1)"
+FROMLINESZ=`wc -c < "$FROMLINE"`
+MMDFDELIMLINESZ=1
+HDRSZ=`wc -c < "$HDR"`
# makembox_A mboxname sz
# Assemble a mailbox into file mboxname, with two messages, such
MBOX="$1"
SZ=$2
- WANTSZ="$(($SZ - $HDRSZ - $FROMLINESZ - 1))"
+ arith_eval $SZ - $HDRSZ - $FROMLINESZ - 1; WANTSZ=$arith_val
dd if="$FILLER" of="$MBOX.body" bs="$WANTSZ" count=1 2>/dev/null
echo >> "$MBOX.body"
cat "$FROMLINE" "$HDR" "$MBOX.body" > "$MBOX"
echo >> "$MBOX"
}
+# makemmdf_A mmdfboxname sz
+makemmdf_A () {
+ MBOX="$1"
+ SZ=$2
+
+ arith_eval $SZ - $HDRSZ - $MMDFDELIMLINESZ - 1; WANTSZ=$arith_val
+ dd if="$FILLER" of="$MBOX.body" bs="$WANTSZ" count=1 2>/dev/null
+ echo >> "$MBOX.body"
+ #### The trailing $MMDF_DELIM's allows $MBOX to exactly match a file
+ #### created by packf.
+ (eval "$MMDF_DELIM"; cat "$HDR" "$MBOX.body"; eval "$MMDF_DELIM"; \
+ eval "$MMDF_DELIM"; cat "$HDR" "$FILLER"; eval "$MMDF_DELIM") > "$MBOX"
+}
+
# make_mbox_B mboxname sz
# Test B makes a mailbox with one message of sz bytes long,
# which ends in a partial mbox delimiter (ie part of the string
MBOX="$1"
SZ=$2
- WANTSZ="$(($SZ - $HDRSZ - $FROMLINESZ - 1))"
+ arith_eval $SZ - $HDRSZ - $FROMLINESZ - 1; WANTSZ=$arith_val
dd if="$FILLER" of="$MBOX.body" bs="$WANTSZ" count=1 2>/dev/null
echo >> "$MBOX.body"
cat "$FROMLINE" "$HDR" "$MBOX.body" > "$MBOX"
echo >> "$MBOX"
}
-# do_one_test_A sz
+# makemmdf_B mmdfboxname sz
+makemmdf_B () {
+ MBOX="$1"
+ SZ=$2
+
+ arith_eval $SZ - $HDRSZ - $MMDFDELIMLINESZ - 1; WANTSZ=$arith_val
+ dd if="$FILLER" of="$MBOX.body" bs="$WANTSZ" count=1 2>/dev/null
+ echo >> "$MBOX.body"
+ #### The final $MMDF_DELIM allows $MBOX to exactly match a file
+ #### created by packf.
+ (eval "$MMDF_DELIM"; cat "$HDR" "$MBOX.body"; eval "$MMDF_DELIM") > "$MBOX"
+}
+
+# do_one_test_A sz mbox_type
# Do a single test with message one's body of size sz.
do_one_test_A () {
SZ=$1
- makembox_A "$MH_TEST_DIR/eom-align.mbox" $STDIO_BUFSZ
+ MBOX_TYPE=$2
+ printf '%5s %s A\r' $SZ $MBOX_TYPE
+ case $MBOX_TYPE in
+ mbox) makembox_A "$MH_TEST_DIR/eom-align.mbox" $SZ ;;
+ mmdf) makemmdf_A "$MH_TEST_DIR/eom-align.mbox" $SZ ;;
+ esac
$VALGRIND inc -silent -file "$MH_TEST_DIR/eom-align.mbox"
# We know the messages should be 11 and 12 in inbox
# Now get the bodies back out.
- sed -e '1,/^$/d' "$MH_TEST_DIR/Mail/inbox/11" > "$MH_TEST_DIR/eom-align.inbox.body1"
- sed -e '1,/^$/d' "$MH_TEST_DIR/Mail/inbox/12" > "$MH_TEST_DIR/eom-align.inbox.body2"
- diff -u "$MH_TEST_DIR/eom-align.mbox.body" "$MH_TEST_DIR/eom-align.inbox.body1"
- diff -u "$FILLER" "$MH_TEST_DIR/eom-align.inbox.body2"
+ body1="$MH_TEST_DIR/eom-align.inbox.body1"
+ body2="$MH_TEST_DIR/eom-align.inbox.body2"
+ sed -e '1,/^$/d' "$MH_TEST_DIR/Mail/inbox/11" > "$body1"
+ sed -e '1,/^$/d' "$MH_TEST_DIR/Mail/inbox/12" > "$body2"
+ check "$MH_TEST_DIR/eom-align.mbox.body" "$body1" 'keep first'
+ check "$FILLER" "$body2" 'keep first'
rmm 11 12
}
-# do_one_test_B sz
+# do_one_test_B sz mbox_type
# Do a test type B
do_one_test_B () {
SZ=$1
- makembox_B "$MH_TEST_DIR/eom-align.mbox" $STDIO_BUFSZ
+ MBOX_TYPE=$2
+ printf '%5s %s B\r' $SZ $MBOX_TYPE
+ case $MBOX_TYPE in
+ mbox) makembox_B "$MH_TEST_DIR/eom-align.mbox" $SZ ;;
+ mmdf) makemmdf_B "$MH_TEST_DIR/eom-align.mbox" $SZ ;;
+ esac
$VALGRIND inc -silent -file "$MH_TEST_DIR/eom-align.mbox"
# We know the message should be 11 in the inbox
- sed -e '1,/^$/d' "$MH_TEST_DIR/Mail/inbox/11" > "$MH_TEST_DIR/eom-align.inbox.body1"
- diff -u "$MH_TEST_DIR/eom-align.mbox.body" "$MH_TEST_DIR/eom-align.inbox.body1"
+ body1="$MH_TEST_DIR/eom-align.inbox.body1"
+ sed -e '1,/^$/d' "$MH_TEST_DIR/Mail/inbox/11" > "$body1"
+ check "$MH_TEST_DIR/eom-align.mbox.body" "$body1" 'keep first'
rmm 11
}
-
# Cover a decent range around the stdio buffer size to make sure we catch
# any corner cases whether they relate to total message size equal to
# buffer size or to body size equal to buffer size.
-START=$(($STDIO_BUFSZ - 16))
-FINISH=$(($STDIO_BUFSZ + $HDRSZ + $FROMLINESZ + 32))
-echo "Testing inc of files with various alignments of eom marker with buffer size..."
+arith_eval $STDIO_BUFSZ - 16; START=$arith_val
+arith_eval $STDIO_BUFSZ + $HDRSZ + $FROMLINESZ + 32; FINISH=$arith_val
+[ -t 1 ] && echo \
+"Testing inc of files with various alignments of eom marker with buffer size..."
+
+#### Trouble spots for the particular input, with BUFSZ of 8192:
+for sz in 3146 3147 7241 7242 7243 11338 11339 15433 15434 15435; do
+ do_one_test_A $sz mbox
+ do_one_test_A $sz mmdf
+done
+
+# Also 155, 174, 175, but they're too small for makembox_B to handle.
+for sz in 684 4074 4097 4148 4610 4611 5121 5122 6654 6655 8170 \
+ 8193 8244 8364 12266 12289 12340 16362 16385 16436; do
+ do_one_test_B $sz mbox
+ do_one_test_B $sz mmdf
+done
+
i="$START"
while test $i -le $FINISH; do
- progress_update $i $START $FINISH
- do_one_test_A $i
- do_one_test_B $i
- i=$(expr $i + 1)
+ do_one_test_A $i mbox
+ do_one_test_A $i mmdf
+ do_one_test_B $i mbox
+ do_one_test_B $i mmdf
+ i=`expr $i + 1`
done
-progress_done
+printf '\n'
+
+test ${failed:-0} -eq 0 && \
+rm "$MH_TEST_DIR/eom-align.mbox" "$MH_TEST_DIR/eom-align.mbox.body"
+
+exit $failed
projects / nmh / blobdiff