X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/63764e68d4fce20854dc2ba18a7244cb6a6769ca..8023f7eb111623d44bfa5c0b13961f8e901d252c:/test/mhfixmsg/test-mhfixmsg?ds=inline

diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg
index 14b9a58a..5ac77ca5 100755
--- a/test/mhfixmsg/test-mhfixmsg
+++ b/test/mhfixmsg/test-mhfixmsg
@@ -45,6 +45,8 @@ Usage: mhfixmsg [+folder] [msgs] [switches]
   -[no]fixcte
   -file file
   -outfile file
+  -rmmproc program
+  -normmproc
   -[no]verbose
   -version
   -help
@@ -555,7 +557,9 @@ Db2yPbwK
 EOF
 
 cp -p `mhpath last` "$expected"
+set +e
 mhfixmsg last
+set -e
 check `mhpath last` "$expected" 'keep first'
 
 
@@ -626,13 +630,12 @@ mhfixmsg last -textcodeset utf-8 -outfile "$actual" 2>"$actual.err"
 if grep "mhfixmsg: Can't convert .* to .* without iconv" "$actual.err" \
   >/dev/null; then
   echo skipping -textcodeset check because nmh was built without iconv
-  set +e
   rm -f "$expected" "$actual" "$actual.err"
 else
-  set +e
   check "$expected" "$actual"
   rm "$actual.err"
 fi
+set -e
 
 
 # check -nofixboundary
@@ -857,6 +860,22 @@ check "${MH_TEST_DIR}/Mail/inbox/14.backup" \
       "${MH_TEST_DIR}/Mail/inbox/14.original"
 
 
+# check -normmproc
+cp "${MH_TEST_DIR}/Mail/inbox/18" "${MH_TEST_DIR}/Mail/inbox/19"
+
+run_test 'mhfixmsg 18 -normmproc'
+check "${MH_TEST_DIR}/Mail/inbox/19" \
+      "${MH_TEST_DIR}/Mail/inbox/,18" 'keep first'
+
+
+# check -rmmproc
+run_test 'mhfixmsg 19 -rmmproc true'
+if test -f '${MH_TEST_DIR}/Mail/inbox/19.backup'; then
+  echo check of mhfixmsg -rmmproc FAILED, should not have created backup file
+  failed=`expr ${failed:-0} + 1`
+fi
+
+
 # make sure there are no tmp files left over
 find "$MH_TEST_DIR/Mail" \( -name 'mhfix*' -o -name ',mhfix*' \) -print \
   >"$actual"