Fix local delivery delay when combined with remote callout/hold. Bug 2599

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

diff --git a/test/confs/0380 b/test/confs/0380
index 5264a7d83906dde4446fae7666c8c06681c9a08d..0bad1f7c2203b91b8eded20046d1226b8b13a7ba 100644 (file)
--- a/test/confs/0380
+++ b/test/confs/0380
@@ -1,14 +1,8 @@
 # Exim test configuration 0380
 
-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 -----
 
@@ -31,13 +25,13 @@ r0:
 r1:
   driver = redirect
   local_parts = aaaa
-  file = DIR/non-exist/$local_part
+  file = DIR/non-exist/${bless:$local_part}
 
 r2:
   driver = redirect
   local_parts = bbbb
   ignore_enotdir
-  file = DIR/non-exist/$local_part
+  file = DIR/non-exist/${bless:$local_part}
 
 r3:
   driver = accept
@@ -49,7 +43,7 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   user = CALLER