Sync 4.next from master

[exim.git] / test / stdout / 0572

diff --git a/test/stdout/0572 b/test/stdout/0572
index d50a643b42e1ac9ab15ecab4d972a62e243f4ee3..96ab5611b10d95bef59ad6c11a2e7089380fccd3 100644 (file)
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -78,8 +78,8 @@ OPT =
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 1 "TESTSUITE/aux-var/tls_conf_prefix"
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 1 "TESTSUITE/aux-var/tls_conf_prefix"

+keep_environment = PATH

 exim_path = TESTSUITE/eximdir/exim
 exim_path = TESTSUITE/eximdir/exim

-keep_environment =

 host_lookup_order = bydns
 spool_directory = TESTSUITE/spool
 log_file_path = TESTSUITE/spool/log/%slog
 host_lookup_order = bydns
 spool_directory = TESTSUITE/spool
 log_file_path = TESTSUITE/spool/log/%slog


@@ -117,8 +117,8 @@ OPT =
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 1 "TESTSUITE/aux-var/tls_conf_prefix"
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 1 "TESTSUITE/aux-var/tls_conf_prefix"

+keep_environment = PATH

 exim_path = TESTSUITE/eximdir/exim
 exim_path = TESTSUITE/eximdir/exim

-keep_environment =

 host_lookup_order = bydns
 spool_directory = TESTSUITE/spool
 log_file_path = TESTSUITE/spool/log/%slog
 host_lookup_order = bydns
 spool_directory = TESTSUITE/spool
 log_file_path = TESTSUITE/spool/log/%slog