From: Heiko Schlittermann (HS12-RIPE) Date: Wed, 28 Dec 2016 15:11:34 +0000 (+0100) Subject: Testsuite: fix 0173 + 2100+, take 2 X-Git-Tag: exim-4_91_RC1~148^2~42^2~2 X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=813799834138a364f17595cbd517617dcf348c2a;p=user%2Fhenk%2Fcode%2Fexim.git 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 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