X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fformat%2Ftest-myhost;h=375f8ac511f5954faf10a9a85df3d128b2a5e213;hb=0f0af4e32a4d734209c16282b63f7cb1094e2699;hp=c132565291abebafb147003179a3fce5d48ff84b;hpb=93a31f9b884f8e8f3f7a7d50cf90ffd365a14f7c;p=mmh

diff --git a/test/format/test-myhost b/test/format/test-myhost
index c132565..375f8ac 100755
--- a/test/format/test-myhost
+++ b/test/format/test-myhost
@@ -5,31 +5,24 @@
 #
 
 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"
 
 setup_test
 
-runtest()
-{
-	testoutput=$(${MH_LIB_DIR}/ap -format "%(myhost)" ignore)
-
-	if [ x"$1" != x"${testoutput}" ]; then
-		echo "For $2, expected $1 but got ${testoutput}"
-		exit 1
-	fi
-}
-
-runtest "$(hostname)" "local hostname test"
+host=`${MH_OBJ_DIR}/test/getfqdn`
+run_test "${MH_LIB_DIR}/ap -format %(myhost) ignore" "$host" \
+         "local hostname test"
 
 cp ${MHMTSCONF} ${MH_TEST_DIR}/Mail/mts.conf || exit 1
-export MHMTSCONF="${MH_TEST_DIR}/Mail/mts.conf"
+MHMTSCONF="${MH_TEST_DIR}/Mail/mts.conf"
 
 echo "localname: some.random.name" >> ${MHMTSCONF}
 
-runtest "some.random.name" "mts.conf localname test"
+run_test "${MH_LIB_DIR}/ap -format %(myhost) ignore" "some.random.name" \
+         "mts.conf localname test"
 
-exit 0
+exit $failed