Testsuite: output changes resulting

[exim.git] / test / stderr / 0396

diff --git a/test/stderr/0396 b/test/stderr/0396
index 36700ad73d1cfc34035b090788fe19ae248e666c..e141e74e04b87bd588a5260a113feea2194409ea 100644 (file)
--- a/test/stderr/0396
+++ b/test/stderr/0396
@@ -1,10 +1,11 @@
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1234
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@the.local.host.name
 set_process_info: pppp accepting a local SMTP message from <CALLER@the.local.host.name>
@@ -13,14 +14,22 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
+SMTP<< helo test
+SMTP>> 250 the.local.host.name Hello CALLER at test
 SMTP<< mail from:<x@y>
+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
-processing "accept"
+processing inline ACL "accept"
 check domains = +fail
-expansion of "${if eq {x}{y}{}fail}" forced failure: assume not in this list
+y in "+fail"?
+ list element: +fail
+  start sublist fail
+   expansion of "${if eq {x}{y}{}fail}" forced failure: assume not in this list
+  end sublist fail
 y in "+fail"? no (end of list)
-accept: condition test failed
+accept: condition test failed in inline ACL
 end of inline ACL: implicit DENY
 SMTP>> 550 Administrative prohibition
 LOG: MAIN REJECT
@@ -29,6 +38,6 @@ created log directory TESTSUITE/spool/log
 SMTP<< quit
 SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>