Testsuite: output changes resulting

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

diff --git a/test/confs/0100 b/test/confs/0100
index 948d807c1ad4376eb9e304d590a61c28d40bd209..afe04a4c1c95bdbfc1e139061728c7f24437c809 100644 (file)
--- a/test/confs/0100
+++ b/test/confs/0100
@@ -1,12 +1,7 @@
 # Exim test configuration 0100
 
 # Exim test configuration 0100
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+

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


@@ -77,17 +72,19 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 filtered_smtp:
   driver = smtp
   port = PORT_S
 
 filtered_smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

   transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat"
 
 local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
   transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat"
 
 local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add

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

   return_path_add
   current_directory = /
   user = CALLER
   return_path_add
   current_directory = /
   user = CALLER


@@ -96,7 +93,7 @@ hackfree_local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
   driver = appendfile
   delivery_date_add
   envelope_to_add

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

   check_string =
   return_path_add
   user = CALLER
   check_string =
   return_path_add
   user = CALLER


@@ -108,7 +105,7 @@ bsmtp_local_delivery:
   use_bsmtp
   delivery_date_add
   envelope_to_add
   use_bsmtp
   delivery_date_add
   envelope_to_add

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

   return_path_add
   user = CALLER
   current_directory = /
   return_path_add
   user = CALLER
   current_directory = /


@@ -119,7 +116,7 @@ bsmtp_local_delivery_filtered:
   use_bsmtp
   delivery_date_add
   envelope_to_add
   use_bsmtp
   delivery_date_add
   envelope_to_add

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

   return_path_add
   transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat"
   user = CALLER
   return_path_add
   transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat"
   user = CALLER


@@ -139,7 +136,7 @@ filtered_local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
   driver = appendfile
   delivery_date_add
   envelope_to_add

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

   return_path_add
   transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat"
   current_directory = /
   return_path_add
   transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat"
   current_directory = /


@@ -149,7 +146,7 @@ mmdf_local_delivery:
   driver = appendfile
   check_string = "\1\1\1\1\n"
   escape_string = "\1\1\1\1 \n"
   driver = appendfile
   check_string = "\1\1\1\1\n"
   escape_string = "\1\1\1\1 \n"

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

   message_prefix = "\1\1\1\1\n"
   message_suffix = "\1\1\1\1\n"
   user = CALLER
   message_prefix = "\1\1\1\1\n"
   message_suffix = "\1\1\1\1\n"
   user = CALLER