testsuite: abstract out common conf settings

[users/heiko/exim.git] / test / stdout / 0572

diff --git a/test/stdout/0572 b/test/stdout/0572
index 0c8d6e9b765c3c8a1a4ed653f75a972ab7bbc5b3..d6efce012e62d1b90677a0269248a57846fa2482 100644 (file)
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -72,14 +72,20 @@ size_addition = 1024
 # 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"

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

-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

+# 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


@@ -104,14 +110,20 @@ begin transports
 # 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"

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

-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

+# 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