X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b46d49baab6621c3fdbe14f12884871edd7be812..11eaebe50c6562b8919bc8d2a457c87269083818:/test/inc/test-eom-align

diff --git a/test/inc/test-eom-align b/test/inc/test-eom-align
index 84b52c42..cea2f377 100755
--- a/test/inc/test-eom-align
+++ b/test/inc/test-eom-align
@@ -137,10 +137,7 @@ do_one_test_A () {
   SZ=$1
   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
+  make${MBOX_TYPE}_A "$MH_TEST_DIR/eom-align.mbox" $SZ
   $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.
@@ -150,7 +147,7 @@ do_one_test_A () {
   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
+  rm "$MH_TEST_DIR/Mail/inbox/11" "$MH_TEST_DIR/Mail/inbox/12"
 }
 
 # do_one_test_B sz mbox_type
@@ -159,16 +156,13 @@ do_one_test_B () {
   SZ=$1
   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
+  make${MBOX_TYPE}_B "$MH_TEST_DIR/eom-align.mbox" $SZ
   $VALGRIND inc -silent -file "$MH_TEST_DIR/eom-align.mbox"
   # We know the message should be 11 in the inbox
   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
+  rm "$MH_TEST_DIR/Mail/inbox/11"
 }
 
 # Cover a decent range around the stdio buffer size to make sure we catch
@@ -195,14 +189,15 @@ done
 i="$START"
 while test $i -le $FINISH; do
   do_one_test_A $i mbox
-  do_one_test_A $i mmdf
   do_one_test_B $i mbox
+  do_one_test_A $i mmdf
   do_one_test_B $i mmdf
   i=`expr $i + 1`
 done
 printf '\n'
 
 test ${failed:-0} -eq 0  &&  \
-rm "$MH_TEST_DIR/eom-align.mbox" "$MH_TEST_DIR/eom-align.mbox.body"
+rm "$MH_TEST_DIR/eom-align.mbox" "$MH_TEST_DIR/eom-align.mbox.body" \
+   "$mmdf_magic" "$empty_line"
 
 exit $failed