Merge from master into 4.next

[exim.git] / test / confs / 0557

diff --git a/test/confs/0557 b/test/confs/0557
index 3c5d5519734617e8210dfca3b7599449069caa25..9b7dec2e6e64249cadd0afe3b2fa74cc5fda5315 100644 (file)
--- a/test/confs/0557
+++ b/test/confs/0557
@@ -1,18 +1,13 @@
 # Exim test configuration 0557
 
-X=
-Y=
+FAKE=
+OPT=
 HOSTS=
 HAI=
 
-exim_path = EXIM_PATH
-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 -----
 
@@ -24,8 +19,8 @@ begin routers
 r1:
   driver = manualroute
   route_list = * HOSTS
-X host_find_failed = ignore
-Y host_all_ignored = HAI
+FAKE host_find_failed = ignore
+OPT  host_all_ignored = HAI
   no_more
   self = send
   transport = t1