X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fmhshow%2Ftest-subpart;h=eb74acddd53fdad662b44d261bf6f4ee2cbdac30;hb=706236baa4c4670b5a074092dec5dec63ff50663;hp=9d8fe2980afd752705e190b96872e0d64a8fb20b;hpb=6106441685a38400d9aa94ccb7218218102f941c;p=mmh

diff --git a/test/mhshow/test-subpart b/test/mhshow/test-subpart
index 9d8fe29..eb74acd 100755
--- a/test/mhshow/test-subpart
+++ b/test/mhshow/test-subpart
@@ -8,11 +8,12 @@
 
 set -e
 
-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
 
@@ -20,8 +21,8 @@ expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
 
 # Write message with a text/plain subpart.
-msgfile=$(mhpath new)
-msgnum=$(basename $msgfile)
+msgfile=`mhpath new`
+msgnum=`basename $msgfile`
 cat > $msgfile <<EOF
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="NextPart_001"
@@ -56,4 +57,6 @@ EOF
 
 # check it
 mhshow -part 1.1 -form mhl.null -nopause $msgnum > $actual 2>&1
-diff -u $expected $actual  &&  rm -f $expected $actual
+check "$expected" "$actual"
+
+exit $failed