Testsuite: TLS client testcase consolidation

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

diff --git a/test/confs/0452 b/test/confs/0452
index f7b7aa40aa02c6c09f465b4d210cfb9185df8b1a..7ae6a2ad0139666b1c970cd063ae16cabd40f2a8 100644 (file)
--- a/test/confs/0452
+++ b/test/confs/0452
@@ -1,14 +1,8 @@
 # Exim test configuration 0452
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 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 -----
@@ -23,7 +17,7 @@ begin routers
 r1:
   driver = redirect
   allow_filter
-  file = DIR/aux-fixed/TESTNUM.filter-$h_fno:
+  file = DIR/aux-fixed/TESTNUM.${bless:filter-$h_fno:}
   reply_transport = t2
   user = CALLER
 
@@ -38,7 +32,7 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   user = CALLER
 
 t2: