Attempt to fix test-ap on fbsd-10 build host.

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

diff --git a/test/mhshow/test-cte-binary b/test/mhshow/test-cte-binary
index 7d2125d78ba852f6a12a9ec26677ad02a8c89c23..f872e3b0b0b103fb0dd2891b82f8c1068bd4aec0 100755 (executable)
--- a/test/mhshow/test-cte-binary
+++ b/test/mhshow/test-cte-binary
@@ -6,8 +6,8 @@
 ######################################################
 
 if test -z "${MH_OBJ_DIR}"; then
 ######################################################
 
 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"
 fi
 
 . "$MH_OBJ_DIR/test/common.sh"


@@ -17,8 +17,8 @@ expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
 
 # Write message with Content-Transfer-Encoding: binary text.
 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
 cat > $msgfile <<EOF
 Content-Transfer-Encoding: binary
 To: bar@example.edu


@@ -35,6 +35,7 @@ EOF
 
 # check it
 cat > $expected <<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
 Date:    Tue, 05 Mar 2002 18:20:35 +0000
 To:      bar@example.edu
 From:    foo@example.edu


@@ -43,8 +44,11 @@ Subject: test
 MIME-Version: 1.0
 Content-Disposition: inline
 
 MIME-Version: 1.0
 Content-Disposition: inline
 

-part       text/plain                  34
+[ part  - text/plain -   34B  ]

 This is a test; this is the body.
 EOF
 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
+