Testsuite: ensure logging path is set

diff --git a/test/confs/0577 b/test/confs/0577
index 261a096f12d61ed13aad503a5d9a0ce7ce6004b9..33d42889048d6886f92745561089750fb4b874a3 100644 (file)
--- a/test/confs/0577
+++ b/test/confs/0577
@@ -1 +1,2 @@
+.include DIR/aux-var/std_conf_prefix

 .include confs/TESTNUM./aaa
 .include confs/TESTNUM./aaa

diff --git a/test/confs/0907 b/test/confs/0907
index 8cb2b1b6d621df6dc0da521cfcdcbf645441e625..f813322d2d12a2d1fba6339223bb7c514ca1ac07 100644 (file)
--- a/test/confs/0907
+++ b/test/confs/0907
@@ -1,3 +1,4 @@
 # This file contains a BOM at the very beginning
 # This file contains a BOM at the very beginning

+.include DIR/aux-var/std_conf_prefix

 tls_advertise_hosts =
 keep_environment =
 tls_advertise_hosts =
 keep_environment =

diff --git a/test/stdout/0577 b/test/stdout/0577
index 43cbe3a2b0acebed5b45fe62f1f79ba5ccb7bb4c..893f9224327d2e24034f236135aacd04017027ea 100644 (file)
--- a/test/stdout/0577
+++ b/test/stdout/0577
@@ -1,7 +1,22 @@
 # Exim Configuration (X)
 # 1 "TESTSUITE/test-config"
 # 1 "TESTSUITE/test-config"
 # Exim Configuration (X)
 # 1 "TESTSUITE/test-config"
 # 1 "TESTSUITE/test-config"

+# 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
+host_lookup_order = bydns
+spool_directory = TESTSUITE/spool
+log_file_path = TESTSUITE/spool/log/%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+chunking_advertise_hosts =
+# 1 "TESTSUITE/aux-var/std_conf_prefix"
+tls_advertise_hosts =
+# 1 "TESTSUITE/test-config"
+# 2 "TESTSUITE/test-config"

 # 1 "TESTSUITE/confs/0577./aaa"
 # 1 "TESTSUITE/confs/0577./aaa"
 # 1 "TESTSUITE/confs/0577./aaa"
 # 1 "TESTSUITE/confs/0577./aaa"
 # 1 "TESTSUITE/confs/0577./aaa"
 # 1 "TESTSUITE/confs/0577./aaa"

-# 1 "TESTSUITE/test-config"
+# 2 "TESTSUITE/test-config"