X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/93a31f9b884f8e8f3f7a7d50cf90ffd365a14f7c..762f11f89e80e3611697dce82068ec461044b66a:/test/format/test-myhost

diff --git a/test/format/test-myhost b/test/format/test-myhost
index c1325652..43cce195 100755
--- a/test/format/test-myhost
+++ b/test/format/test-myhost
@@ -5,31 +5,31 @@
 #
 
 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"
+start_test 'local hostname test'
+set +e
+host=`${MH_OBJ_DIR}/test/getcanon`
+set -e
+myhost=`${MH_LIBEXEC_DIR}/ap -format '%(myhost)' ignore 2>&1`
+if [ "$myhost" != "$host" ]; then
+   echo "$0: myhost reports $myhost but canonical hostname is $host"
+fi
 
+start_test 'mts.conf localname 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_LIBEXEC_DIR}/ap -format %(myhost) ignore" "some.random.name"
+
 
-exit 0
+finish_test
+exit $failed