Testsuite: accept debug & testscript output sizes varying with testhost name

[exim.git] / test / confs / 0001

diff --git a/test/confs/0001 b/test/confs/0001
index 14db5ae2696921340502c4a25eda4a991f655afc..0fd7efe44c702433e6700514a1897a9f6bb7c428 100644 (file)
--- a/test/confs/0001
+++ b/test/confs/0001
@@ -5,8 +5,8 @@
 # mess up the creation of the spool directory etc.
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
-rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
@@ -39,6 +39,7 @@ bounce_return_body = false
 no_bounce_return_message
 return_size_limit = 12K
 bounce_return_size_limit = 10K
+bounce_return_linesize_limit = 997
 callout_domain_negative_expire = 1h
 callout_domain_positive_expire = 1d
 callout_negative_expire = 5h
@@ -147,7 +148,7 @@ no_queue_only_override
 queue_only_file = /var/spool/exim/queue_only
 queue_only_load = 8.2
 no_queue_run_in_order
-queue_run_max = 5
+queue_run_max = ${if = {1}{1} {5}{10}}
 queue_smtp_domains = x.y.z
 receive_timeout = 0s
 received_header_text = Received: ${if def:sender_rcvhost {from ${sender_rcvhost}\n\t}{${if def:sender_ident {from ${sender_ident} }}${if def:sender_helo_name {(helo=${sender_helo_name})\n\t}}}}by ${primary_hostname} ${if def:received_protocol {with ${received_protocol}}} (Exim ${version_number} #${compile_number})\n\tid ${message_id}${if def:received_for {\n\tfor $received_for}}
@@ -204,6 +205,7 @@ system_filter_user = 99
 tcp_nodelay = false
 timeout_frozen_after = 7d
 timezone = EDT
+tls_advertise_hosts =
 trusted_groups = 42
 trusted_users = ${readfile{DIR/aux-fixed/TESTNUM.trusted}{:}}
 unknown_login = unknownlogin