summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2016-12-28 16:11:34 +0100
committerHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2016-12-28 16:42:22 +0100
commit813799834138a364f17595cbd517617dcf348c2a (patch)
tree64322225b0c0202f7f099344d229bd8a8e561122
parentc045091796727f56e305ca2c9f44409bc07d71ad (diff)
Testsuite: fix 0173 + 2100+, take 2
-rw-r--r--test/aux-var-src/std_conf_prefix1
-rw-r--r--test/aux-var-src/tls_conf_prefix1
-rw-r--r--test/stdout/05724
3 files changed, 3 insertions, 3 deletions
diff --git a/test/aux-var-src/std_conf_prefix b/test/aux-var-src/std_conf_prefix
index 859ac510f..2565c2677 100644
--- 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 faa291acd..20b6fe85f 100644
--- 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 d50a643b4..96ab5611b 100644
--- 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