testsuite: abstract out common conf settings

6 files changed, 31 insertions, 19 deletions

diff --git a/test/stdout/0572 b/test/stdout/0572
index 0c8d6e9b7..d6efce012 100644
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -72,14 +72,20 @@ size_addition = 1024
 # 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 =
-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
+# 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
@@ -104,14 +110,20 @@ begin transports
 # 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 =
-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
+# 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
diff --git a/test/stdout/4201 b/test/stdout/4201
index 8b89b2bd3..5a110f292 100644
--- a/test/stdout/4201
+++ b/test/stdout/4201
@@ -28,7 +28,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> body
 >>> .
 ??? 250
-<<< 250 OK id=10HmaX-0005vi-00
+<<< 250 OK id=10HmaZ-0005vi-00
 >>> QUIT
 ??? 221
 <<< 221 the.local.host.name closing connection
@@ -63,7 +63,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> body
 >>> .
 ??? 250
-<<< 250 OK id=10HmaY-0005vi-00
+<<< 250 OK id=10HmbA-0005vi-00
 >>> QUIT
 ??? 221
 <<< 221 the.local.host.name closing connection
@@ -78,5 +78,5 @@ End of script
 250 OK

 250 Accepted

 354 Enter message, ending with "." on a line by itself

-250 OK id=10HmaZ-0005vi-00

+250 OK id=10HmaX-0005vi-00

 221 the.local.host.name closing connection

diff --git a/test/stdout/4211 b/test/stdout/4211
index a0e463dc2..2dc813509 100644
--- a/test/stdout/4211
+++ b/test/stdout/4211
@@ -30,7 +30,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> body
 >>> .
 ??? 250
-<<< 250 OK id=10HmaX-0005vi-00
+<<< 250 OK id=10HmaZ-0005vi-00
 >>> QUIT
 ??? 221
 <<< 221 the.local.host.name closing connection
@@ -67,7 +67,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> body
 >>> .
 ??? 250
-<<< 250 OK id=10HmaY-0005vi-00
+<<< 250 OK id=10HmbA-0005vi-00
 >>> QUIT
 ??? 221
 <<< 221 the.local.host.name closing connection
@@ -83,5 +83,5 @@ End of script
 250 OK

 250 Accepted

 354 Enter message, ending with "." on a line by itself

-250 OK id=10HmaZ-0005vi-00

+250 OK id=10HmaX-0005vi-00

 221 the.local.host.name closing connection

diff --git a/test/stdout/4221 b/test/stdout/4221
index a0e463dc2..2dc813509 100644
--- a/test/stdout/4221
+++ b/test/stdout/4221
@@ -30,7 +30,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> body
 >>> .
 ??? 250
-<<< 250 OK id=10HmaX-0005vi-00
+<<< 250 OK id=10HmaZ-0005vi-00
 >>> QUIT
 ??? 221
 <<< 221 the.local.host.name closing connection
@@ -67,7 +67,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> body
 >>> .
 ??? 250
-<<< 250 OK id=10HmaY-0005vi-00
+<<< 250 OK id=10HmbA-0005vi-00
 >>> QUIT
 ??? 221
 <<< 221 the.local.host.name closing connection
@@ -83,5 +83,5 @@ End of script
 250 OK

 250 Accepted

 354 Enter message, ending with "." on a line by itself

-250 OK id=10HmaZ-0005vi-00

+250 OK id=10HmaX-0005vi-00

 221 the.local.host.name closing connection

diff --git a/test/stdout/5410 b/test/stdout/5410
index edf01f8ba..365fe2502 100644
--- a/test/stdout/5410
+++ b/test/stdout/5410
@@ -8,7 +8,7 @@
 250 OK

 250 Accepted

 354 Enter message, ending with "." on a line by itself

-250 OK id=10HmaY-0005vi-00

+250 OK id=10HmaX-0005vi-00

 221 myhost.test.ex closing connection

 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 250-myhost.test.ex Hello CALLER at myhost.test.ex

@@ -20,7 +20,7 @@
 250 OK

 250 Accepted

 354 Enter message, ending with "." on a line by itself

-250 OK id=10HmbA-0005vi-00

+250 OK id=10HmaZ-0005vi-00

 221 myhost.test.ex closing connection

 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 250-myhost.test.ex Hello CALLER at myhost.test.ex

@@ -32,5 +32,5 @@
 250 OK

 250 Accepted

 354 Enter message, ending with "." on a line by itself

-250 OK id=10HmbC-0005vi-00

+250 OK id=10HmbB-0005vi-00

 221 myhost.test.ex closing connection

diff --git a/test/stdout/5420 b/test/stdout/5420
index edf01f8ba..365fe2502 100644
--- a/test/stdout/5420
+++ b/test/stdout/5420
@@ -8,7 +8,7 @@
 250 OK

 250 Accepted

 354 Enter message, ending with "." on a line by itself

-250 OK id=10HmaY-0005vi-00

+250 OK id=10HmaX-0005vi-00

 221 myhost.test.ex closing connection

 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 250-myhost.test.ex Hello CALLER at myhost.test.ex

@@ -20,7 +20,7 @@
 250 OK

 250 Accepted

 354 Enter message, ending with "." on a line by itself

-250 OK id=10HmbA-0005vi-00

+250 OK id=10HmaZ-0005vi-00

 221 myhost.test.ex closing connection

 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 250-myhost.test.ex Hello CALLER at myhost.test.ex

@@ -32,5 +32,5 @@
 250 OK

 250 Accepted

 354 Enter message, ending with "." on a line by itself

-250 OK id=10HmbC-0005vi-00

+250 OK id=10HmbB-0005vi-00

 221 myhost.test.ex closing connection