tidying

[exim.git] / test / stderr / 3000

diff --git a/test/stderr/3000 b/test/stderr/3000
index 6f8b2689d370ece3b567d37ddcffdf3e425c8cb3..cda513207b77b284f15b4f56adc8788a5d3694bc 100644 (file)
--- a/test/stderr/3000
+++ b/test/stderr/3000
@@ -1,5 +1,6 @@
 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 ....

+Hints DB:

 environment after trimming:
  PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 environment after trimming:
  PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys


@@ -13,57 +14,57 @@ try option unknown_login
   ╭considering: foo}{arg1}}
   ├───────text: foo
   ├considering: }{arg1}}
   ╭considering: foo}{arg1}}
   ├───────text: foo
   ├considering: }{arg1}}

-  ├──expanding: foo
+  ├───expanded: foo

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

-  ├──expanding: arg1
+  ├───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}}
   ├───────text: foo_undef
   ├considering: }}
  ╭considering: ${perl{foo_undef}}
   ╭considering: foo_undef}}
   ├───────text: foo_undef
   ├considering: }}

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

   ├───────text: debug_write
   ├───────text: debug_write

-  ├considering: }{debug from Perl\n}}
-  ├──expanding: debug_write
+  ├considering: }{debug░from░Perl\n}}
+  ├───expanded: debug_write

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

-  ╭considering: debug from Perl\n}}
-  ├───────text: debug from Perl
+  ╭considering: debug░from░Perl\n}}
+  ├───────text: debug░from░Perl

   ├considering: \n}}
   ├backslashed: '\n'
   ├considering: }}
   ├considering: \n}}
   ├backslashed: '\n'
   ├considering: }}

-  ├──expanding: debug from Perl\n
-  ╰─────result: debug from Perl
+  ├───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}}
+ ├───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
   ├───────text: log_write

-  ├considering: }{log from Perl}}
-  ├──expanding: log_write
+  ├considering: }{log░from░Perl}}
+  ├───expanded: log_write

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

-  ╭considering: log from Perl}}
-  ├───────text: log from Perl
+  ╭considering: log░from░Perl}}
+  ├───────text: log░from░Perl

   ├considering: }}
   ├considering: }}

-  ├──expanding: log from Perl
-  ╰─────result: log from Perl
+  ├───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
+ ├───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
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from CALLER


@@ -92,11 +93,11 @@ LOG: smtp_connection MAIN
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_rcpt"
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_rcpt"

->>> processing "accept" (TESTSUITE/test-config 20)
+>>> processing ACL check_rcpt "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
 LOG: this is a warning at TESTSUITE/aux-fixed/3000.pl line 25.
 >>> check condition = ${if !eq {${perl{foo_warn}}}{}}
 >>>                 = true

->>> accept: condition test succeeded in ACL "check_rcpt"
->>> end of ACL "check_rcpt": ACCEPT
+>>> accept: condition test succeeded in ACL check_rcpt
+>>> end of ACL check_rcpt: ACCEPT

 
 ******** SERVER ********
 
 ******** SERVER ********