Document and distribute mhshow.marker

[nmh] / test / mhfixmsg / test-mhfixmsg

diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg
index 5b039ea1ee844611a3853d47aa4135ec2a1f792a..d60b9d768d7942021bfa080e69971061925a2167 100755 (executable)
--- a/test/mhfixmsg/test-mhfixmsg
+++ b/test/mhfixmsg/test-mhfixmsg
@@ -567,7 +567,7 @@ MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 
 ------- =_aaaaaaaaaa0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
 
 ------- =_aaaaaaaaaa0

-Content-Type: text/plain; charset="iso-8859-1"; name="square.txt"
+Content-Type: text/plain; charset="iso-8859-1"; name="nul+square.txt"

 Content-Transfer-Encoding: base64
 
 AL2yPbwK
 Content-Transfer-Encoding: base64
 
 AL2yPbwK


@@ -588,7 +588,7 @@ MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary=\"----- =_aaaaaaaaaa0\"
 
 ------- =_aaaaaaaaaa0
 Content-Type: multipart/mixed; boundary=\"----- =_aaaaaaaaaa0\"
 
 ------- =_aaaaaaaaaa0

-Content-Type: text/plain; charset=\"iso-8859-1\"; name=\"square.txt\"
+Content-Type: text/plain; charset=\"iso-8859-1\"; name=\"nul+square.txt\"

 Content-Transfer-Encoding: binary
 
 " "
 Content-Transfer-Encoding: binary
 
 " "


@@ -713,17 +713,13 @@ vbI9vAo=
 ------- =_aaaaaaaaaa0--
 EOF
 
 ------- =_aaaaaaaaaa0--
 EOF
 

-set +e
-run_prog mhfixmsg last -textcharset utf-8 -outfile "$actual" 2>"$actual.err"
-if grep "mhfixmsg: Can't convert .* to .* without iconv" "$actual.err" \
-  >/dev/null; then
-  echo "$0: skipping -textcharset check because nmh was built without iconv"
-  rm -f "$expected" "$actual" "$actual.err"
-else
+if test "$ICONV_ENABLED" -eq 1; then
+  run_prog mhfixmsg last -textcharset utf-8 -outfile "$actual" 2>&1

   check "$expected" "$actual"
   check "$expected" "$actual"

-  rm "$actual.err"
+else
+  echo "$0: skipping -textcharset check because nmh was built without iconv"
+  rm -f "$expected"

 fi
 fi

-set -e

 
 
 # check -nofixboundary
 
 
 # check -nofixboundary


@@ -774,7 +770,7 @@ fi
 cat >"$expected" <<EOF
 Date: Fri, 13 May 2011 08:21:12 -0500
 Content-Type: multipart/alternative;
 cat >"$expected" <<EOF
 Date: Fri, 13 May 2011 08:21:12 -0500
 Content-Type: multipart/alternative;

-        boundary="----=_NextPart_000_1781A1A_01CC1147.81EBA8D4"
+       boundary="----=_NextPart_000_1781A1A_01CC1147.81EBA8D4"

 Content-Transfer-Encoding: 8bit
 MIME-Version: 1.0
 From: <sender@example.com>
 Content-Transfer-Encoding: 8bit
 MIME-Version: 1.0
 From: <sender@example.com>