Replace printf("foo\n") with puts("foo").

[nmh] / test / format / test-myhost

diff --git a/test/format/test-myhost b/test/format/test-myhost
index d7e53e160ad87c50339da23fe8d4957a3d0ea78a..fd0db89d3bf60d5c211778d424722dd74b48811b 100755 (executable)
--- a/test/format/test-myhost
+++ b/test/format/test-myhost
@@ -13,23 +13,18 @@ fi
 
 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"
+set +e
+host=`${MH_OBJ_DIR}/test/getcanon`
+set -e
+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