Rewrite norm_charmap(), moving code into data.

[nmh] / test / mhshow / test-cte-binary

diff --git a/test/mhshow/test-cte-binary b/test/mhshow/test-cte-binary
index e5654bbff52f623ca7e024a8edc1199b56b9a312..f872e3b0b0b103fb0dd2891b82f8c1068bd4aec0 100755 (executable)
--- a/test/mhshow/test-cte-binary
+++ b/test/mhshow/test-cte-binary
@@ -5,19 +5,20 @@
 #
 ######################################################
 
-if [ -z "${MH_TEST_COMMON}" ]; then
-    echo "MH_TEST_COMMON not set; try running via 'make check'"
+if test -z "${MH_OBJ_DIR}"; then
+    srcdir=`dirname "$0"`/../..
+    MH_OBJ_DIR=`cd "$srcdir" && pwd`; export MH_OBJ_DIR
 fi
 
-. ${MH_TEST_COMMON}
+. "$MH_OBJ_DIR/test/common.sh"
 
 setup_test
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
 
 # Write message with Content-Transfer-Encoding: binary text.
-msgfile=$(mhpath new)
-msgnum=$(basename $msgfile)
+msgfile=`mhpath new`
+msgnum=`basename $msgfile`
 cat > $msgfile <<EOF
 Content-Transfer-Encoding: binary
 To: bar@example.edu
@@ -34,6 +35,7 @@ EOF
 
 # check it
 cat > $expected <<EOF
+[ Message inbox:11 ]
 Date:    Tue, 05 Mar 2002 18:20:35 +0000
 To:      bar@example.edu
 From:    foo@example.edu
@@ -42,8 +44,11 @@ Subject: test
 MIME-Version: 1.0
 Content-Disposition: inline
 
-part       text/plain                  34
+[ part  - text/plain -   34B  ]
 This is a test; this is the body.
 EOF
-mhshow -nopause $msgnum > $actual 2>&1
-diff -u $expected $actual
+run_prog mhshow $msgnum > $actual 2>&1
+check "$expected" "$actual" : C-T-E binary text
+
+exit $failed
+