Testsuite: tidying

[exim.git] / test / confs / 0533

diff --git a/test/confs/0533 b/test/confs/0533
index c43b628ee891e980cfc186460a082456258b06c8..36e547ad6650215a978a8c9e98e6ea68f6636ce9 100644 (file)
--- a/test/confs/0533
+++ b/test/confs/0533
@@ -1,13 +1,8 @@
 # Exim test configuration 0533
 
 # Exim test configuration 0533
 

-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

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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


@@ -21,7 +16,7 @@ r1:
   driver = redirect
   local_part_prefix = file-
   local_part_suffix = =*
   driver = redirect
   local_part_prefix = file-
   local_part_suffix = =*

-  data = DIR/test-mail/${substr_1:$local_part_suffix}
+  data = DIR/test-mail/${extract {${substr_1:$local_part_suffix}} {mbox=mbox mbox2=mbox2}}

   file_transport = t1
 
 r2:
   file_transport = t1
 
 r2:


@@ -29,7 +24,7 @@ r2:
   local_part_prefix = pipe-
   local_part_suffix = =*
   caseful_local_part = true
   local_part_prefix = pipe-
   local_part_suffix = =*
   caseful_local_part = true

-  data = |${substr_1:$local_part_suffix}
+  data = |DIR/bin/${extract {$local_part} {userx=iefbr14 usery=iefbr14 userz=../bin/iefbr14}}

   pipe_transport = t2
 
 
   pipe_transport = t2
 
 


@@ -39,6 +34,7 @@ begin transports
 
 t1:
   driver = appendfile
 
 t1:
   driver = appendfile

+  create_file = DIR/test-mail

   envelope_to_add
   user = CALLER
   batch_max = 10
   envelope_to_add
   user = CALLER
   batch_max = 10