Testsuite: account for (now) properly working Perl locale

[exim.git] / test / stdout / 0572

diff --git a/test/stdout/0572 b/test/stdout/0572
index 240a2332a0d64fc8196ae3bbfc9c5ee6a20732fb..272aa06a1345b1e18496c2e86b4aab21e973d94f 100644 (file)
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -57,6 +57,8 @@ no_hosts_override
 no_hosts_randomize
 hosts_require_auth = 
 hosts_try_auth = 
 no_hosts_randomize
 hosts_require_auth = 
 hosts_try_auth = 

+hosts_try_chunking = *
+hosts_try_fastopen = 

 hosts_try_prdr = *
 interface = ip4.ip4.ip4.ip4
 keepalive
 hosts_try_prdr = *
 interface = ip4.ip4.ip4.ip4
 keepalive


@@ -68,18 +70,26 @@ protocol = smtp
 retry_include_ip_address
 serialize_hosts = 
 size_addition = 1024
 retry_include_ip_address
 serialize_hosts = 
 size_addition = 1024

-socks_proxy = 127.0.0.1 port=1225

 
 # Exim Configuration (X)
 # 1 "TESTSUITE/test-config"
 OPT =
 
 # Exim Configuration (X)
 # 1 "TESTSUITE/test-config"
 OPT =

+# 5 "TESTSUITE/test-config"
+# 1 "TESTSUITE/aux-var/std_conf_prefix"
+# 1 "TESTSUITE/aux-var/std_conf_prefix"
+# 1 "TESTSUITE/aux-var/tls_conf_prefix"
+keep_environment = PATH

 exim_path = TESTSUITE/eximdir/exim
 exim_path = TESTSUITE/eximdir/exim

-hide host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+host_lookup_order = bydns

 spool_directory = TESTSUITE/spool
 log_file_path = TESTSUITE/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 spool_directory = TESTSUITE/spool
 log_file_path = TESTSUITE/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME

+dns_cname_loops = 9
+chunking_advertise_hosts =
+# 1 "TESTSUITE/aux-var/std_conf_prefix"
+# 5 "TESTSUITE/test-config"
+primary_hostname = myhost.test.ex

 log_selector = +outgoing_port
 domainlist local_domains = test.ex : *.test.ex
 acl_smtp_rcpt = accept
 log_selector = +outgoing_port
 domainlist local_domains = test.ex : *.test.ex
 acl_smtp_rcpt = accept


@@ -91,7 +101,7 @@ begin routers
     route_list = * 127.0.0.1
     self = send
     transport = my_smtp
     route_list = * 127.0.0.1
     self = send
     transport = my_smtp

-    debug_print = router_name <$router_name>
+    hide debug_print = router_name <$router_name>

     no_more
 
 begin transports
     no_more
 
 begin transports


@@ -100,5 +110,40 @@ begin transports
     driver = smtp
     interface = ip4.ip4.ip4.ip4
     port = 1224
     driver = smtp
     interface = ip4.ip4.ip4.ip4
     port = 1224

-    hide socks_proxy = 127.0.0.1 port=1225

     debug_print = transport_name <$transport_name>
     debug_print = transport_name <$transport_name>

+# Exim Configuration (X)
+# 1 "TESTSUITE/test-config"
+OPT =
+# 5 "TESTSUITE/test-config"
+# 1 "TESTSUITE/aux-var/std_conf_prefix"
+# 1 "TESTSUITE/aux-var/std_conf_prefix"
+# 1 "TESTSUITE/aux-var/tls_conf_prefix"
+keep_environment = PATH
+exim_path = TESTSUITE/eximdir/exim
+host_lookup_order = bydns
+spool_directory = TESTSUITE/spool
+log_file_path = TESTSUITE/spool/log/%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+dns_cname_loops = 9
+chunking_advertise_hosts =
+# 1 "TESTSUITE/aux-var/std_conf_prefix"
+# 5 "TESTSUITE/test-config"
+primary_hostname = myhost.test.ex
+log_selector = +outgoing_port
+domainlist local_domains = test.ex : *.test.ex
+acl_smtp_rcpt = accept
+begin routers
+my_main_router:
+driver = manualroute
+route_list = * 127.0.0.1
+self = send
+transport = my_smtp
+hide debug_print = router_name <$router_name>
+no_more
+begin transports
+my_smtp:
+driver = smtp
+interface = ip4.ip4.ip4.ip4
+port = 1224
+debug_print = transport_name <$transport_name>