Testsuite: TLS server testcase consolidation

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

diff --git a/test/confs/0260 b/test/confs/0260
index 442ab2880ec589de1746cb4b2ddaec91e1dfd3e8..257ea82da437d035cd9fba01477c93e8058f0870 100644 (file)
--- a/test/confs/0260
+++ b/test/confs/0260
@@ -1,13 +1,8 @@
 # Exim test configuration 0260
 
 # Exim test configuration 0260
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

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


@@ -19,7 +14,7 @@ begin transports
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   user = CALLER
 
 bad_return:
   user = CALLER
 
 bad_return:


@@ -35,7 +30,7 @@ bad_uid:
 
 exp_fail:
   driver = appendfile
 
 exp_fail:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   user = CALLER
   home_directory = ${if rhubarb
 
   user = CALLER
   home_directory = ${if rhubarb