diff options
Diffstat (limited to 'tests/testsuite.at')
| -rw-r--r-- | tests/testsuite.at | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/tests/testsuite.at b/tests/testsuite.at index 30ef20f7..5dcc1d1f 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -63,6 +63,7 @@ AT_CHECK([mailfromd $MFOPTS --test prog $2],m4_shift(m4_shift($@))) ]) m4_define([MAILFROMD_OPTIONS]) +m4_define([MTASIM_DEFS]) m4_define([AT_MTA_TEST_X],[ AT_DATA([script],$1) @@ -70,18 +71,30 @@ m4_define([AT_MTA_TEST_X],[ mtasim $MTAOPTS < script > /dev/null], $2,$3,$4,[mailfromd_stop])]) +dnl AT_MTA_TEST(filter,script,retcode,out,err) m4_define([AT_MTA_TEST],[ - AT_DATA([script],$2) AT_CHECK([AT_UNPRIVILEGED_PREREQ - mtasim --stdio -Xauto --statedir -- MAILFROMD_OPTIONS [$ETCDIR]/$1 < script > /dev/null], - $3,$4,$5)]) + mtasim MTASIM_DEFS --stdio -Xauto --statedir -- MAILFROMD_OPTIONS $1 < $2 > /dev/null], + m4_shift(m4_shift($@)))]) + +m4_define([AT_MTA_TEST_FILTER],[ + AT_DATA([script],$2) + AT_MTA_TEST([$ETCDIR]/$1,script,m4_shift(m4_shift($@)))]) + +m4_define([AT_MTA_TEST_SCRIPT],[ + AT_DATA([filter],[$1]) + AT_MTA_TEST(filter,[$ETCDIR]/$2,m4_shift(m4_shift($@)))]) + +m4_define([AT_MTA_TEST_FILTER_SCRIPT],[ + AT_DATA([filter],$1) + AT_DATA([script],$2) + AT_MTA_TEST([$ETCDIR]/$1,script,m4_shift(m4_shift($@)))]) m4_define([AT_WITH_MAILFROMD_OPTIONS],[ m4_pushdef([MAILFROMD_OPTIONS],$1) $2 m4_popdef([MAILFROMD_OPTIONS])]) - AT_INIT AT_TESTED([mailfromd]) @@ -168,3 +181,12 @@ m4_include([fromargs.at]) m4_include([rcptargs.at]) m4_include([curmsg.at]) + +m4_include([hdr-count.at]) +m4_include([hdr-get.at]) +m4_include([hdr-getn.at]) +m4_include([hdr-gete.at]) +m4_include([hdr-itr.at]) +m4_include([hdr-all.at]) +m4_include([hdr-cap.at]) +m4_include([hdr-mul.at]) |