Unbreak build with dmarc, pt. 2

[exim.git] / test / stderr / 3000

diff --git a/test/stderr/3000 b/test/stderr/3000
index 3f8338b67def685b237607bad24ff219b9a6e054..86c8b4261f87bba1b25f447e23a8f3501e895f27 100644 (file)
--- a/test/stderr/3000
+++ b/test/stderr/3000
@@ -1,47 +1,65 @@
 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 ....

+adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys

 configuration file is TESTSUITE/test-config
 admin user
 configuration file is TESTSUITE/test-config
 admin user

- ┌considering: ${perl{foo}{arg1}}
-  ┌considering: foo}{arg1}}
+dropping to exim gid; retaining priv uid
+ ╭considering: ${perl{foo}{arg1}}
+  ╭considering: foo}{arg1}}
+  ├───────text: foo
+  ├considering: }{arg1}}

   ├──expanding: foo
   ├──expanding: foo

-  └─────result: foo
-  ┌considering: arg1}}
+  ╰─────result: foo
+  ╭considering: arg1}}
+  ├───────text: arg1
+  ├considering: }}

   ├──expanding: arg1
   ├──expanding: arg1

-  â\94\94─────result: arg1
+  â\95°─────result: arg1

 Starting Perl interpreter
  ├──expanding: ${perl{foo}{arg1}}
 Starting Perl interpreter
  ├──expanding: ${perl{foo}{arg1}}

- └─────result: Subroutine foo called with args: arg1
- ┌considering: ${perl{foo_undef}}
-  ┌considering: foo_undef}}
+ ╰─────result: Subroutine foo called with args: arg1
+ ╭considering: ${perl{foo_undef}}
+  ╭considering: foo_undef}}
+  ├───────text: foo_undef
+  ├considering: }}

   ├──expanding: foo_undef
   ├──expanding: foo_undef

-  â\94\94─────result: foo_undef
+  â\95°─────result: foo_undef

  ├failed to expand: ${perl{foo_undef}}
  ├───error message: Perl subroutine "foo_undef" returned undef to force failure
  ├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}}
+ ╰failure was forced
+ ╭considering: ${perl{debug_write}{debug from Perl\n}}
+  ╭considering: debug_write}{debug from Perl\n}}
+  ├───────text: debug_write
+  ├considering: }{debug from Perl\n}}

   ├──expanding: debug_write
   ├──expanding: debug_write

-  └─────result: debug_write
-  ┌considering: debug from Perl\n}}
+  ╰─────result: debug_write
+  ╭considering: debug from Perl\n}}
+  ├───────text: debug from Perl
+  ├considering: \n}}
+  ├backslashed: '\n'
+  ├considering: }}

   ├──expanding: debug from Perl\n
   ├──expanding: debug from Perl\n

-  â\94\94─────result: debug from Perl
+  â\95°─────result: debug from Perl

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

   ├──expanding: log_write
   ├──expanding: log_write

-  └─────result: log_write
-  ┌considering: log from Perl}}
+  ╰─────result: log_write
+  ╭considering: log from Perl}}
+  ├───────text: log from Perl
+  ├considering: }}

   ├──expanding: log from Perl
   ├──expanding: log from Perl

-  â\94\94─────result: log from Perl
+  â\95°─────result: log from Perl

 LOG: MAIN
   log from Perl
  ├──expanding: ${perl{log_write}{log from Perl}}
 LOG: MAIN
   log from Perl
  ├──expanding: ${perl{log_write}{log from Perl}}

- â\94\94─────result: Wrote log
->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+ â\95°─────result: Wrote log
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 LOG: MAIN
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 LOG: MAIN


@@ -61,7 +79,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"
 >>> 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
 LOG: this is a warning at TESTSUITE/aux-fixed/3000.pl line 25.
 >>> check condition = ${if !eq {${perl{foo_warn}}}{}}
 >>>                 = true