From efdccb093d1945ed1bffe0b8f8606ebc01c5926f Mon Sep 17 00:00:00 2001 From: David Levine Date: Sat, 26 Aug 2017 16:06:52 -0400 Subject: [PATCH] Treat %(myhost) failure to match canonical hostname as information. Not an error from test-myhost. --- test/format/test-myhost | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/test/format/test-myhost b/test/format/test-myhost index fd0db89d..43cce195 100755 --- a/test/format/test-myhost +++ b/test/format/test-myhost @@ -13,18 +13,23 @@ fi setup_test +start_test 'local hostname test' set +e host=`${MH_OBJ_DIR}/test/getcanon` set -e -run_test "${MH_LIBEXEC_DIR}/ap -format %(myhost) ignore" "$host" \ - "local hostname test" +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 MHMTSCONF="${MH_TEST_DIR}/Mail/mts.conf" echo "localname: some.random.name" >> ${MHMTSCONF} -run_test "${MH_LIBEXEC_DIR}/ap -format %(myhost) ignore" "some.random.name" \ - "mts.conf localname test" +run_test "${MH_LIBEXEC_DIR}/ap -format %(myhost) ignore" "some.random.name" + +finish_test exit $failed -- 2.56.0