imaptest.c: Don't use error message as adios()'s format.

[nmh] / test / format / test-myhost

diff --git a/test/format/test-myhost b/test/format/test-myhost
index c132565291abebafb147003179a3fce5d48ff84b..43cce195ba10ca9d56f936c8c8ce839e0b7f5c19 100755 (executable)
--- a/test/format/test-myhost
+++ b/test/format/test-myhost
@@ -5,31 +5,31 @@
 #
 
 if test -z "${MH_OBJ_DIR}"; then
 #
 
 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
 
 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
 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}
 
 
 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