MySQL, pgsql: per-query server options outside the lookup string. Bug 2546

[users/jgh/exim.git] / test / stderr / 3000

diff --git a/test/stderr/3000 b/test/stderr/3000
index b77ca89239debf86a1e67172e95dd533e852c934..0996e349f0de9107e4dc81b325c95b16a0bb2922 100644 (file)
--- a/test/stderr/3000
+++ b/test/stderr/3000
@@ -1,47 +1,49 @@
 1999-03-02 09:44:33 this is a warning at TESTSUITE/aux-fixed/3000.pl line 25.
 Exim version x.yz ....
+adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
- /considering: ${perl{foo}{arg1}}
-  /considering: foo}{arg1}}
-  |__expanding: foo
-  \_____result: foo
-  /considering: arg1}}
-  |__expanding: arg1
-  \_____result: arg1
+dropping to exim gid; retaining priv uid
+ ╭considering: ${perl{foo}{arg1}}
+  ╭considering: foo}{arg1}}
+  ├──expanding: foo
+  ╰─────result: foo
+  ╭considering: arg1}}
+  ├──expanding: arg1
+  ╰─────result: arg1
 Starting Perl interpreter
- |__expanding: ${perl{foo}{arg1}}
- \_____result: Subroutine foo called with args: arg1
- /considering: ${perl{foo_undef}}
-  /considering: foo_undef}}
-  |__expanding: foo_undef
-  \_____result: foo_undef
- |failed to expand: ${perl{foo_undef}}
- |___error message: Perl subroutine "foo_undef" returned undef to force failure
- \failure was forced
- /considering: ${perl{debug_write}{debug from Perl\n}}
-  /considering: debug_write}{debug from Perl\n}}
-  |__expanding: debug_write
-  \_____result: debug_write
-  /considering: debug from Perl\n}}
-  |__expanding: debug from Perl\n
-  \_____result: debug from Perl
-
+ ├──expanding: ${perl{foo}{arg1}}
+ ╰─────result: Subroutine foo called with args: arg1
+ ╭considering: ${perl{foo_undef}}
+  ╭considering: foo_undef}}
+  ├──expanding: foo_undef
+  ╰─────result: foo_undef
+ ├failed to expand: ${perl{foo_undef}}
+ ├───error message: Perl subroutine "foo_undef" returned undef to force failure
+ ╰failure was forced
+ ╭considering: ${perl{debug_write}{debug from Perl\n}}
+  ╭considering: debug_write}{debug from Perl\n}}
+  ├──expanding: debug_write
+  ╰─────result: debug_write
+  ╭considering: debug from Perl\n}}
+  ├──expanding: debug from Perl\n
+  ╰─────result: debug from Perl
+  
 debug from Perl
- |__expanding: ${perl{debug_write}{debug from Perl\n}}
- \_____result: Wrote debug
- /considering: ${perl{log_write}{log from Perl}}
-  /considering: log_write}{log from Perl}}
-  |__expanding: log_write
-  \_____result: log_write
-  /considering: log from Perl}}
-  |__expanding: log from Perl
-  \_____result: log from Perl
+ ├──expanding: ${perl{debug_write}{debug from Perl\n}}
+ ╰─────result: Wrote debug
+ ╭considering: ${perl{log_write}{log from Perl}}
+  ╭considering: log_write}{log from Perl}}
+  ├──expanding: log_write
+  ╰─────result: log_write
+  ╭considering: log from Perl}}
+  ├──expanding: log from Perl
+  ╰─────result: log from Perl
 LOG: MAIN
   log from Perl
- |__expanding: ${perl{log_write}{log from Perl}}
- \_____result: Wrote log
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+ ├──expanding: ${perl{log_write}{log from Perl}}
+ ╰─────result: Wrote log
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 LOG: MAIN
@@ -61,7 +63,7 @@ LOG: smtp_connection MAIN
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_rcpt"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 20)
 LOG: this is a warning at TESTSUITE/aux-fixed/3000.pl line 25.
 >>> check condition = ${if !eq {${perl{foo_warn}}}{}}
 >>>                 = true