export MH_TEST_DIR so that test/dist/test-dist can be run standalone.

[nmh] / test / format / test-myhost

diff --git a/test/format/test-myhost b/test/format/test-myhost
index d303a8f2f47604026df9bd72f587369e19522d62..cb82846a6a13fc14e3b0f6a3d96a05a4dd5d3814 100755 (executable)
--- a/test/format/test-myhost
+++ b/test/format/test-myhost
@@ -4,31 +4,25 @@
 # the localname entry out of the mts configuration file.
 #
 
 # the localname entry out of the mts configuration file.
 #
 

-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
 
 fi
 

-. ${MH_TEST_COMMON}
+. "$MH_OBJ_DIR/test/common.sh"

 
 setup_test
 
 
 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/getcanon`
+run_test "${MH_LIBEXEC_DIR}/ap -format %(myhost) ignore" "$host" \
+         "local hostname 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" \
+         "mts.conf localname test"

 
 

-exit 0
+exit $failed