aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2009-09-15 18:14:10 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2009-09-15 18:14:10 +0300
commit11f4cc2bf12505c7ee5bb2fda2d8603e36b02154 (patch)
treeb0244c417f5332b4e5bf258da9bcef10553a6f53
parent8d78e540492a6ff02994734be5ead551d3a38ad8 (diff)
downloadmailfromd-11f4cc2bf12505c7ee5bb2fda2d8603e36b02154.tar.gz
mailfromd-11f4cc2bf12505c7ee5bb2fda2d8603e36b02154.tar.bz2
Fix testsuite.
* tests/testsuite.at (MAILFROMD_OPTIONS): New definition (MF_CHECK_TEXT, MF_RUN_TEXT, AT_MTA_TEST_X) (AT_MTA_TEST): Always pass MAILFROMD_OPTIONS to mailfromd. (AT_WITH_MAILFROMD_OPTIONS): Always prepend $MFOPTS $MFADDOPTS
-rw-r--r--tests/testsuite.at10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 22d5df72..8e5775ae 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -36,6 +36,7 @@ m4_define([EX_PROTOCOL], 76) dnl remote error in protocol
m4_define([EX_NOPERM], 77) dnl permission denied
m4_define([EX_CONFIG], 78) dnl configuration error
+m4_define([MAILFROMD_OPTIONS],[$MFOPTS $MFADDOPTS])
m4_define([AT_SKIP_TEST],[exit 77])
@@ -59,7 +60,7 @@ m4_define([MF_CHECK_TEXT],[
dnl Save the program
AT_DATA([prog],[$1
])
-AT_CHECK([mailfromd $MFOPTS $MFADDOPTS --test prog $2],m4_shift(m4_shift($@)))
+AT_CHECK([mailfromd $MFOPTS $MFADDOPTS MAILFROMD_OPTIONS --test prog $2],m4_shift(m4_shift($@)))
])
dnl MF_RUN_TEXT(TEXT,[ARGS],
@@ -68,16 +69,15 @@ m4_define([MF_RUN_TEXT],[
dnl Save the program
AT_DATA([prog],[$1
])
-AT_CHECK([mailfromd $MFOPTS $MFADDOPTS --run prog $2],m4_shift(m4_shift($@)))
+AT_CHECK([mailfromd $MFOPTS $MFADDOPTS MAILFROMD_OPTIONS --run prog $2],m4_shift(m4_shift($@)))
])
-m4_define([MAILFROMD_OPTIONS])
m4_define([MTASIM_DEFS])
m4_define([AT_MTA_TEST_X],[
AT_DATA([script],$1)
AT_CHECK([AT_UNPRIVILEGED_PREREQ
- mtasim $MTAOPTS < script > /dev/null],
+ mtasim $MTAOPTS -- MAILFROMD_OPTIONS < script > /dev/null],
$2,$3,$4,[mailfromd_stop])])
dnl AT_MTA_TEST(filter,script,retcode,out,err)
@@ -100,7 +100,7 @@ m4_define([AT_MTA_TEST_FILTER_SCRIPT],[
AT_MTA_TEST([filter],script,m4_shift(m4_shift($@)))])
m4_define([AT_WITH_MAILFROMD_OPTIONS],[
-m4_pushdef([MAILFROMD_OPTIONS],$1)
+m4_pushdef([MAILFROMD_OPTIONS],[$MFOPTS $MFADDOPTS ]$1)
$2
m4_popdef([MAILFROMD_OPTIONS])])

Return to:

Send suggestions and report system problems to the System administrator.