X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fmhbuild%2Ftest-forw;h=5369f226ec2e9119a6e1b0f2bf410a13ffbb9720;hb=6ce3e60f25c94b31e5d090ea03dee09d70dc1f7b;hp=c92242f79e456105c05805b381ee216e8029ad33;hpb=6106441685a38400d9aa94ccb7218218102f941c;p=mmh

diff --git a/test/mhbuild/test-forw b/test/mhbuild/test-forw
index c92242f..5369f22 100755
--- a/test/mhbuild/test-forw
+++ b/test/mhbuild/test-forw
@@ -5,23 +5,15 @@
 #
 ######################################################
 
-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
 
-# TODO: Move to a common file tests can source; need more framework...
-failed=0
-check() {
-    diff -u $expected $actual
-    if [ $? -ne 0 ]; then
-        failed=$((failed + 1))
-    fi
-}
-
 # Make a draft file forwarding two messages.
 mkdraft() {
     cat > $draft <<EOF
@@ -80,7 +72,7 @@ EOF
 mkdraft
 mhbuild $draft
 mungedraft
-check
+check $expected $actual
 
 # check mhbuild -rfc934
 cat > $expected <<EOF
@@ -117,6 +109,6 @@ EOF
 mkdraft
 mhbuild -rfc934 $draft
 mungedraft
-check
+check $expected $actual
 
 exit $failed