Testsuite: TLS client testcase consolidation

[users/heiko/exim.git] / test / confs / 1009

diff --git a/test/confs/1009 b/test/confs/1009
index 99b78d9c108f1b3336a4d22d986c2bdad20e1295..c8184a64e246967802a355ca7fa0528c5359a3ad 100644 (file)
--- a/test/confs/1009
+++ b/test/confs/1009
@@ -1,12 +1,9 @@
 # Exim test configuration 1009
 
 # Exim test configuration 1009
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+OPT=
+
+.include DIR/aux-var/std_conf_prefix
+

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -17,10 +14,21 @@ queue_run_in_order
 
 begin routers
 
 
 begin routers
 

+.ifdef ROUTE_DATA
+r0:
+  driver = manualroute
+  route_data = ROUTE_DATA OPT
+  transport = t1
+  self = send
+
+.else
+

 r1:
   driver = dnslookup
   transport = t1
   self = send
 r1:
   driver = dnslookup
   transport = t1
   self = send

+  OPT
+.endif

 
 
 # ----- Transports -----
 
 
 # ----- Transports -----


@@ -30,6 +38,7 @@ begin transports
 t1:
   driver = smtp
   port = PORT_S
 t1:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 
 # ----- Retry -----
 
 
 # ----- Retry -----