Testsuite: TLS server testcase consolidation

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

diff --git a/test/confs/0016 b/test/confs/0016
index d68778639d8e33e73c8555050b2fc13238aae617..9e190d8ebd0b74388f65535d0e4bf64e1c8990e1 100644 (file)
--- a/test/confs/0016
+++ b/test/confs/0016
@@ -1,12 +1,7 @@
 # Exim test configuration 0016
 
-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 =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
@@ -22,7 +17,7 @@ userforward:
   allow_filter
   user = CALLER
   local_parts = userx : CALLER
-  file = DIR/aux-fixed/0016.filter.$local_part
+  file = DIR/aux-fixed/0016.filter.${bless:$local_part}
   local_part_suffix = +*
   local_part_suffix_optional
   reply_transport = address_reply
@@ -44,8 +39,11 @@ local_delivery:
   user = CALLER
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/$local_part
+  headers_add = X-local_part: $local_part\n\
+               X-local_part_suffix: $local_part_suffix\n\
+               X-local_part_suffix_v: $local_part_suffix_v
   return_path_add
+  file = DIR/test-mail/${bless:$local_part}
 
 address_reply:
   driver = autoreply