From b3765932b14d24fbc54b3f83e2fe865df48bc2f3 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Wed, 30 Sep 2015 18:05:10 +0100 Subject: [PATCH] Testsuite: nail testcase to ipv4 to avoid output difference in non-6 build --- test/confs/2201 | 1 + test/scripts/2200-dnsdb/2201 | 1 + test/stderr/2201 | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/confs/2201 b/test/confs/2201 index 7b257cce3..a4a44d4da 100644 --- a/test/confs/2201 +++ b/test/confs/2201 @@ -11,6 +11,7 @@ gecos_name = CALLER_NAME # ----- Main settings ----- trusted_users = CALLER +disable_ipv6 acl_smtp_rcpt = check_rcpt acl_not_smtp = check_sndr diff --git a/test/scripts/2200-dnsdb/2201 b/test/scripts/2200-dnsdb/2201 index d432ca187..d09cde2d2 100644 --- a/test/scripts/2200-dnsdb/2201 +++ b/test/scripts/2200-dnsdb/2201 @@ -1,4 +1,5 @@ # query-style lookup in domains, local_parts, senders +need_ipv4 munge debug_pid exim -d -bt test.ex@test.ex unknown@test.ex **** diff --git a/test/stderr/2201 b/test/stderr/2201 index 523ae4395..2d50418f7 100644 --- a/test/stderr/2201 +++ b/test/stderr/2201 @@ -193,7 +193,6 @@ trusted user admin user ppppp daemon_smtp_port overridden by -oX: ppppp <: 1225 -ppppp listening on all interfaces (IPv6) port 1225 ppppp listening on all interfaces (IPv4) port 1225 ppppp pid written to TESTSUITE/spool/exim-daemon.pid ppppp LOG: MAIN -- 2.30.2