Testsuite: nail testcase to ipv4 to avoid output difference in non-6 build

diff --git a/test/confs/2201 b/test/confs/2201
index 7b257cce3dd5d96569a67343274a4cc81b58920d..a4a44d4da658aad057cfd640f5c621c322eb9f8c 100644 (file)
--- a/test/confs/2201
+++ b/test/confs/2201
@@ -11,6 +11,7 @@ gecos_name = CALLER_NAME
 # ----- Main settings -----
 
 trusted_users = CALLER
 # ----- Main settings -----
 
 trusted_users = CALLER

+disable_ipv6

 
 acl_smtp_rcpt = check_rcpt
 acl_not_smtp = check_sndr
 
 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 d432ca1870ce625d217a97e38fba02ba0a599cc7..d09cde2d24790ba3cb46ba958fe949a323dadde9 100644 (file)
--- a/test/scripts/2200-dnsdb/2201
+++ b/test/scripts/2200-dnsdb/2201
@@ -1,4 +1,5 @@
 # query-style lookup in domains, local_parts, senders
 # query-style lookup in domains, local_parts, senders

+need_ipv4

 munge debug_pid
 exim -d -bt test.ex@test.ex unknown@test.ex
 ****
 munge debug_pid
 exim -d -bt test.ex@test.ex unknown@test.ex
 ****

diff --git a/test/stderr/2201 b/test/stderr/2201
index 523ae4395b0a1feab3da50239fbb28167d30b700..2d50418f7f0d68c6f49aefb3aa2defd7317a3352 100644 (file)
--- 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
 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
 ppppp listening on all interfaces (IPv4) port 1225
 ppppp pid written to TESTSUITE/spool/exim-daemon.pid
 ppppp LOG: MAIN