Merge branch '4.next'

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

diff --git a/test/stderr/3000 b/test/stderr/3000
index 3f8338b67def685b237607bad24ff219b9a6e054..49b5e51b7e6c3013c4aa9078c4b672d857119a1b 100644 (file)
--- a/test/stderr/3000
+++ b/test/stderr/3000
@@ -1,46 +1,48 @@
 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}}
+dropping to exim gid; retaining priv uid
+ ╭considering: ${perl{foo}{arg1}}
+  ╭considering: foo}{arg1}}
   ├──expanding: foo
-  â\94\94─────result: foo
-  â\94\8cconsidering: arg1}}
+  â\95°─────result: foo
+  â\95­considering: arg1}}
   ├──expanding: arg1
-  â\94\94─────result: arg1
+  â\95°─────result: arg1
 Starting Perl interpreter
  ├──expanding: ${perl{foo}{arg1}}
- â\94\94─────result: Subroutine foo called with args: arg1
- â\94\8cconsidering: ${perl{foo_undef}}
-  â\94\8cconsidering: foo_undef}}
+ â\95°─────result: Subroutine foo called with args: arg1
+ â\95­considering: ${perl{foo_undef}}
+  â\95­considering: 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
- â\94\94failure was forced
- â\94\8cconsidering: ${perl{debug_write}{debug from Perl\n}}
-  â\94\8cconsidering: debug_write}{debug from Perl\n}}
+ â\95°failure was forced
+ â\95­considering: ${perl{debug_write}{debug from Perl\n}}
+  â\95­considering: debug_write}{debug from Perl\n}}
   ├──expanding: debug_write
-  â\94\94─────result: debug_write
-  â\94\8cconsidering: debug from Perl\n}}
+  â\95°─────result: debug_write
+  â\95­considering: 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}}
- â\94\94─────result: Wrote debug
- â\94\8cconsidering: ${perl{log_write}{log from Perl}}
-  â\94\8cconsidering: log_write}{log from Perl}}
+ â\95°─────result: Wrote debug
+ â\95­considering: ${perl{log_write}{log from Perl}}
+  â\95­considering: log_write}{log from Perl}}
   ├──expanding: log_write
-  â\94\94─────result: log_write
-  â\94\8cconsidering: log from Perl}}
+  â\95°─────result: log_write
+  â\95­considering: 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}}
- â\94\94─────result: Wrote log
+ â\95°─────result: Wrote log
 >>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
@@ -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