X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6106441685a38400d9aa94ccb7218218102f941c..2d8a2d23b4c17ffb277d008f4e011fcc2bb2fa7e:/test/mhshow/test-subpart?ds=sidebyside

diff --git a/test/mhshow/test-subpart b/test/mhshow/test-subpart
index 9d8fe298..eb74acdd 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