Don't need to `else' after done() at end of then-block.

[nmh] / test / format / test-myhost

diff --git a/test/format/test-myhost b/test/format/test-myhost
index 635f35f43e6f9acd22f205f9814ee3383114ff10..fd0db89d3bf60d5c211778d424722dd74b48811b 100755 (executable)
--- a/test/format/test-myhost
+++ b/test/format/test-myhost
@@ -13,16 +13,18 @@ fi
 
 setup_test
 
 
 setup_test
 

-host=`${MH_OBJ_DIR}/test/getfqdn`
-run_test "${MH_LIB_DIR}/ap -format %(myhost) ignore" "$host" \
+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
          "local hostname test"
 
 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}
 

-run_test "${MH_LIB_DIR}/ap -format %(myhost) ignore" "some.random.name" \
+run_test "${MH_LIBEXEC_DIR}/ap -format %(myhost) ignore" "some.random.name" \

          "mts.conf localname test"
 
 exit $failed
          "mts.conf localname test"
 
 exit $failed