Debug: indent ACL and expreassion tracing by evaluation depth

[exim.git] / test / stderr / 3000

diff --git a/test/stderr/3000 b/test/stderr/3000
index 0b7c946d343822401deae775c04a8b1d0ae839ce..b77ca89239debf86a1e67172e95dd533e852c934 100644 (file)
--- a/test/stderr/3000
+++ b/test/stderr/3000
@@ -2,34 +2,45 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-expanding: foo
-   result: foo
-expanding: arg1
-   result: arg1
+ /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
-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
-expanding: debug_write
-   result: debug_write
-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
-expanding: log_write
-   result: log_write
-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
+ |__expanding: ${perl{log_write}{log from Perl}}
+ \_____result: Wrote log
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
@@ -46,7 +57,9 @@ LOG: smtp_connection MAIN
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> x.y.z in helo_lookup_domains? no (end of list)
+>>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_rcpt"
 >>> processing "accept"
 LOG: this is a warning at TESTSUITE/aux-fixed/3000.pl line 25.