projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.sv.nongnu.org:/srv/git/nmh
[mmh]
/
test
/
format
/
test-myhost
diff --git
a/test/format/test-myhost
b/test/format/test-myhost
index
c132565
..
27069af
100755
(executable)
--- a/
test/format/test-myhost
+++ b/
test/format/test-myhost
@@
-5,31
+5,23
@@
#
if test -z "${MH_OBJ_DIR}"; then
#
if test -z "${MH_OBJ_DIR}"; then
- srcdir=`dirname $0`/../..
- MH_OBJ_DIR=`cd $srcdir && pwd`; export MH_OBJ_DIR
+ srcdir=`dirname "$0"`/../..
+ MH_OBJ_DIR=`cd "$srcdir" && pwd`; export MH_OBJ_DIR
fi
. "$MH_OBJ_DIR/test/common.sh"
setup_test
fi
. "$MH_OBJ_DIR/test/common.sh"
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"
+run_test "${MH_LIB_DIR}/ap -format %(myhost) ignore" "`hostname`" \
+ "local hostname test"
cp ${MHMTSCONF} ${MH_TEST_DIR}/Mail/mts.conf || exit 1
export MHMTSCONF="${MH_TEST_DIR}/Mail/mts.conf"
echo "localname: some.random.name" >> ${MHMTSCONF}
cp ${MHMTSCONF} ${MH_TEST_DIR}/Mail/mts.conf || exit 1
export MHMTSCONF="${MH_TEST_DIR}/Mail/mts.conf"
echo "localname: some.random.name" >> ${MHMTSCONF}
-runtest "some.random.name" "mts.conf localname test"
+run_test "${MH_LIB_DIR}/ap -format %(myhost) ignore" "some.random.name" \
+ "mts.conf localname test"
-exit 0
+exit $failed