testsuite output changes resulting

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

diff --git a/test/confs/0231 b/test/confs/0231
index c8dcbd2c9feeeca3c7ea7d775fcea31e93bc1478..67f21c0e17a1398994ff7eeba012421c4c357dc5 100644 (file)
--- a/test/confs/0231
+++ b/test/confs/0231
@@ -1,13 +1,8 @@
 # Exim test configuration 0231
 
 # Exim test configuration 0231
 

-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 -----
 


@@ -56,13 +51,13 @@ begin transports
 
 local_delivery_rewrite:
   driver = appendfile
 
 local_delivery_rewrite:
   driver = appendfile

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

   headers_rewrite = a@test.ex a-rewrite@test.ex
   user = CALLER
 
 local_delivery:
   driver = appendfile
   headers_rewrite = a@test.ex a-rewrite@test.ex
   user = CALLER
 
 local_delivery:
   driver = appendfile

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

   user = CALLER
 
 smtp_rewrite:
   user = CALLER
 
 smtp_rewrite:


@@ -70,6 +65,7 @@ smtp_rewrite:
   headers_rewrite = *@domain1 $1-rewrite@domain2 f :\
                     *@domain1 $1-other@domain2
   port = PORT_S
   headers_rewrite = *@domain1 $1-rewrite@domain2 f :\
                     *@domain1 $1-other@domain2
   port = PORT_S

+  hosts_try_fastopen = :

 
 
 # ----- Retry -----
 
 
 # ----- Retry -----