test-charset: Fix test when HAVE_ICONV is false.

[nmh] / test / format / test-myhost

diff --git a/test/format/test-myhost b/test/format/test-myhost
index 5e6e25d196d69d8d5c5b2735ac2cb99a1d276186..43cce195ba10ca9d56f936c8c8ce839e0b7f5c19 100755 (executable)
--- a/test/format/test-myhost
+++ b/test/format/test-myhost
@@ -13,21 +13,23 @@ fi
 
 setup_test
 
 
 setup_test
 

-# TEMPORARY
-echo getfqdn:
-${MH_OBJ_DIR}/test/getfqdn
-echo hostname:
-uname -n
-host=`${MH_OBJ_DIR}/test/getfqdn`
-run_test "${MH_LIB_DIR}/ap -format %(myhost) ignore" "$host" \
-         "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
 MHMTSCONF="${MH_TEST_DIR}/Mail/mts.conf"
 
 echo "localname: some.random.name" >> ${MHMTSCONF}
 
 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_LIB_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
 exit $failed