MySQL, pgsql: per-query server options outside the lookup string. Bug 2546

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

diff --git a/test/confs/0283 b/test/confs/0283
index 23949cb1f335769224d218790ccf3d7dd2d0d654..7f40efb18dbeb07af7a1672d4dfe852237b1a5d7 100644 (file)
--- a/test/confs/0283
+++ b/test/confs/0283
@@ -1,12 +1,8 @@
 # Exim test configuration 0283
 
 # Exim test configuration 0283
 

-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

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


@@ -41,12 +37,12 @@ t1:
 
 t2:
   driver = appendfile
 
 t2:
   driver = appendfile

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

   user = CALLER
 
 t3:
   driver = appendfile
   user = CALLER
 
 t3:
   driver = appendfile

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

   user = root
 
 # ----- Retry -----
   user = root
 
 # ----- Retry -----