Testsuite: fix 0173 + 2100+, take 2

diff --git a/test/aux-var-src/std_conf_prefix b/test/aux-var-src/std_conf_prefix
index 859ac510f53f53a8922b9706b0ade7a9b77344c0..2565c26770f4862ae520c83721a8679b6c4015a6 100644 (file)
--- a/test/aux-var-src/std_conf_prefix
+++ b/test/aux-var-src/std_conf_prefix
@@ -1,3 +1,2 @@
 .include DIR/aux-var/tls_conf_prefix
 tls_advertise_hosts =
-keep_environment = PATH

diff --git a/test/aux-var-src/tls_conf_prefix b/test/aux-var-src/tls_conf_prefix
index faa291acdb02d3ff4725227383ade8df717e6d73..20b6fe85f44674ce795ab494a3f3836edc5c800a 100644 (file)
--- a/test/aux-var-src/tls_conf_prefix
+++ b/test/aux-var-src/tls_conf_prefix
@@ -1,3 +1,4 @@
+keep_environment = PATH
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 spool_directory = DIR/spool

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"
+keep_environment = PATH
 exim_path = TESTSUITE/eximdir/exim
-keep_environment =
 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"
+keep_environment = PATH
 exim_path = TESTSUITE/eximdir/exim
-keep_environment =
 host_lookup_order = bydns
 spool_directory = TESTSUITE/spool
 log_file_path = TESTSUITE/spool/log/%slog