Debug: fix showing option name for list (vs. list content)

[exim.git] / test / stderr / 3000

diff --git a/test/stderr/3000 b/test/stderr/3000
index 0996e349f0de9107e4dc81b325c95b16a0bb2922..c953369319e2431fb1031cc98501fb3e73fe08aa 100644 (file)
--- a/test/stderr/3000
+++ b/test/stderr/3000
@@ -1,55 +1,76 @@
 1999-03-02 09:44:33 this is a warning at TESTSUITE/aux-fixed/3000.pl line 25.
 Exim version x.yz ....
 1999-03-02 09:44:33 this is a warning at TESTSUITE/aux-fixed/3000.pl line 25.
 Exim version x.yz ....

+environment after trimming:
+ PATH=<munged>

 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid

+try option gecos_pattern
+try option gecos_name
+try option unknown_login

  ╭considering: ${perl{foo}{arg1}}
   ╭considering: foo}{arg1}}
  ╭considering: ${perl{foo}{arg1}}
   ╭considering: foo}{arg1}}

-  ├──expanding: foo
+  ├───────text: foo
+  ├considering: }{arg1}}
+  ├───expanded: foo

   ╰─────result: foo
   ╭considering: arg1}}
   ╰─────result: foo
   ╭considering: arg1}}

-  ├──expanding: arg1
+  ├───────text: arg1
+  ├considering: }}
+  ├───expanded: arg1

   ╰─────result: arg1
 Starting Perl interpreter
   ╰─────result: arg1
 Starting Perl interpreter

- ├──expanding: ${perl{foo}{arg1}}
- ╰─────result: Subroutine foo called with args: arg1
+ ├───expanded: ${perl{foo}{arg1}}
+ ╰─────result: Subroutine░foo░called░with░args:░arg1

  ╭considering: ${perl{foo_undef}}
   ╭considering: foo_undef}}
  ╭considering: ${perl{foo_undef}}
   ╭considering: foo_undef}}

-  ├──expanding: foo_undef
+  ├───────text: foo_undef
+  ├considering: }}
+  ├───expanded: 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
   ╰─────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
+ ╭considering: ${perl{debug_write}{debug░from░Perl\n}}
+  ╭considering: debug_write}{debug░from░Perl\n}}
+  ├───────text: debug_write
+  ├considering: }{debug░from░Perl\n}}
+  ├───expanded: debug_write

   ╰─────result: debug_write
   ╰─────result: debug_write

-  ╭considering: debug from Perl\n}}
-  ├──expanding: debug from Perl\n
-  ╰─────result: debug from Perl
+  ╭considering: debug░from░Perl\n}}
+  ├───────text: debug░from░Perl
+  ├considering: \n}}
+  ├backslashed: '\n'
+  ├considering: }}
+  ├───expanded: debug░from░Perl\n
+  ╰─────result: debug░from░Perl↩

   
 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
+ ├───expanded: ${perl{debug_write}{debug░from░Perl\n}}
+ ╰─────result: Wrote░debug
+ ╭considering: ${perl{log_write}{log░from░Perl}}
+  ╭considering: log_write}{log░from░Perl}}
+  ├───────text: log_write
+  ├considering: }{log░from░Perl}}
+  ├───expanded: log_write

   ╰─────result: log_write
   ╰─────result: log_write

-  ╭considering: log from Perl}}
-  ├──expanding: log from Perl
-  ╰─────result: log from Perl
+  ╭considering: log░from░Perl}}
+  ├───────text: log░from░Perl
+  ├considering: }}
+  ├───expanded: log░from░Perl
+  ╰─────result: log░from░Perl

 LOG: MAIN
   log from Perl
 LOG: MAIN
   log from Perl

- ├──expanding: ${perl{log_write}{log from Perl}}
- ╰─────result: Wrote log
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+ ├───expanded: ${perl{log_write}{log░from░Perl}}
+ ╰─────result: Wrote░log
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 LOG: MAIN
   this is a warning at TESTSUITE/aux-fixed/3000.pl line 25.
 LOG: smtp_connection MAIN
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 LOG: MAIN
   this is a warning at TESTSUITE/aux-fixed/3000.pl line 25.
 LOG: smtp_connection MAIN

-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -58,9 +79,17 @@ LOG: smtp_connection MAIN
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> 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?
+>>>  list element: @
+>>>  list element: @[]

 >>> x.y.z in helo_lookup_domains? no (end of list)
 >>> x.y.z in helo_lookup_domains? no (end of list)

+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")

 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in dsn_advertise_hosts? no (option unset)

->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?

 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_rcpt"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_rcpt"
 >>> processing "accept" (TESTSUITE/test-config 20)