Testsuite: TLS client testcase consolidation

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

diff --git a/test/confs/0131 b/test/confs/0131
index 4ca5af5f4cfc0037daf6b20f7c01566a4bdcacfe..c3df9a89e7d5660a4ad1312df3b1dd078b2716d6 100644 (file)
--- a/test/confs/0131
+++ b/test/confs/0131
@@ -1,13 +1,7 @@
 # Exim test configuration 0131
 
 # Exim test configuration 0131
 

-exim_path = EXIM_PATH
-keep_environment =
-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 -----
 
 
 # ----- Main settings -----
 


@@ -31,7 +25,7 @@ forward:
   driver = redirect
   allow_filter
   no_check_local_user
   driver = redirect
   allow_filter
   no_check_local_user

-  file = DIR/aux-fixed/TESTNUM.$local_part
+  file = DIR/aux-fixed/TESTNUM.${bless:$local_part}

   retry_use_local_part
   user = CALLER
   address_data = $address_data-forward
   retry_use_local_part
   user = CALLER
   address_data = $address_data-forward


@@ -49,7 +43,7 @@ begin transports
 
 appendfile:
   driver = appendfile
 
 appendfile:
   driver = appendfile

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

   user = CALLER
   headers_add = Address-Data: >$address_data<
 
   user = CALLER
   headers_add = Address-Data: >$address_data<