X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/9723f9667322bf96db786fa49d53139a48fabc5e..826cb8c29c:/test/stderr/0386

diff --git a/test/stderr/0386 b/test/stderr/0386
index 8b08794a7..cf6fc1df9 100644
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -33,15 +33,15 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<1@b>
 read ACL from file TESTSUITE/aux-fixed/0386.acl1
-processing "accept"
+processing "accept" (TESTSUITE/test-config 32)
 check hosts = :
 host in ":"? no (end of list)
 accept: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1"
-processing "deny"
+processing "deny" (TESTSUITE/test-config 32)
 check local_parts = ^.*[@%!/|]
 1 in "^.*[@%!/|]"? no (end of list)
 deny: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1"
-processing "require"
+processing "require" (TESTSUITE/test-config 32)
 l_message: Invalid sender
   message: Couldn't verify the sender
 check verify = sender/defer_ok
@@ -67,7 +67,7 @@ routed by r1 router
 ----------- end verify ------------
 sender x@y verified ok
 require: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1"
-processing "deny"
+processing "deny" (TESTSUITE/test-config 32)
   message: No such user here
 deny: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1"
 end of ACL "TESTSUITE/aux-fixed/0386.acl1": DENY
@@ -82,15 +82,15 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<1@b>
 using ACL "TESTSUITE/aux-fixed/0386.acl1"
-processing "accept"
+processing "accept" (TESTSUITE/test-config 32)
 check hosts = :
 host in ":"? no (end of list)
 accept: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1"
-processing "deny"
+processing "deny" (TESTSUITE/test-config 32)
 check local_parts = ^.*[@%!/|]
 1 in "^.*[@%!/|]"? no (end of list)
 deny: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1"
-processing "require"
+processing "require" (TESTSUITE/test-config 32)
 l_message: Invalid sender
   message: Couldn't verify the sender
 check verify = sender/defer_ok
@@ -115,7 +115,7 @@ routed by r1 router
 ----------- end verify ------------
 sender x@y verified ok
 require: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1"
-processing "deny"
+processing "deny" (TESTSUITE/test-config 32)
   message: No such user here
 deny: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1"
 end of ACL "TESTSUITE/aux-fixed/0386.acl1": DENY
@@ -165,7 +165,7 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<2@b>
 read ACL from file TESTSUITE/aux-fixed/0386.acl2
-processing "warn"
+processing "warn" (TESTSUITE/test-config 32)
   message: X-Warning: $sender_host_address is listed at $dnslist_domain\nX-Warning: $dnslist_text
 l_message: found in $dnslist_domain: $dnslist_text
 check dnslists = rbl.test.ex 
@@ -181,7 +181,7 @@ warn: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
 LOG: MAIN
   H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message
 created log directory TESTSUITE/spool/log
-processing "accept"
+processing "accept" (TESTSUITE/test-config 32)
 accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
 end of ACL "TESTSUITE/aux-fixed/0386.acl2": ACCEPT
 SMTP>> 250 Accepted
@@ -217,7 +217,7 @@ LOG: MAIN
   <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
 SMTP>> 250 OK id=10HmaX-0005vi-00
 search_tidyup called
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaX-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp
@@ -245,18 +245,18 @@ body_linecount=1 message_linecount=7
 DSN: set orcpt:   flags: 0
 Delivery address list:
   2@b 
-locking TESTSUITE/spool/db/retry.lockfile
-locked  TESTSUITE/spool/db/retry.lockfile
-EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
-returned from EXIM_DBOPEN: (nil)
-ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
-failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory
+ locking TESTSUITE/spool/db/retry.lockfile
+ locked  TESTSUITE/spool/db/retry.lockfile
+ EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
+ returned from EXIM_DBOPEN: (nil)
+ ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
+ failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: 2@b
 unique = 2@b
-no domain retry record
-no address retry record
+no   domain  retry record
+no   address retry record
 2@b: queued for routing
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing 2@b
@@ -283,11 +283,11 @@ After routing:
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> 2@b <--------
-locking TESTSUITE/spool/db/retry.lockfile
-locked  TESTSUITE/spool/db/retry.lockfile
-EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
-returned from EXIM_DBOPEN: (nil)
-failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
+ locking TESTSUITE/spool/db/retry.lockfile
+ locked  TESTSUITE/spool/db/retry.lockfile
+ EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
+ returned from EXIM_DBOPEN: (nil)
+ failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 search_tidyup called
 changed uid/gid: local delivery to 2 <2@b> transport=t1
@@ -351,7 +351,7 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<2@b>
 using ACL "TESTSUITE/aux-fixed/0386.acl2"
-processing "warn"
+processing "warn" (TESTSUITE/test-config 32)
   message: X-Warning: $sender_host_address is listed at $dnslist_domain\nX-Warning: $dnslist_text
 l_message: found in $dnslist_domain: $dnslist_text
 check dnslists = rbl.test.ex 
@@ -362,7 +362,7 @@ DNS lookup for 13.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
 warn: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
 LOG: MAIN
   H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message
-processing "accept"
+processing "accept" (TESTSUITE/test-config 32)
 accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
 end of ACL "TESTSUITE/aux-fixed/0386.acl2": ACCEPT
 SMTP>> 250 Accepted
@@ -398,7 +398,7 @@ LOG: MAIN
   <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
 SMTP>> 250 OK id=10HmaY-0005vi-00
 search_tidyup called
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaY-0005vi-00
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaY-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp
@@ -426,17 +426,17 @@ body_linecount=1 message_linecount=7
 DSN: set orcpt:   flags: 0
 Delivery address list:
   2@b 
-locking TESTSUITE/spool/db/retry.lockfile
-locked  TESTSUITE/spool/db/retry.lockfile
-EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
-returned from EXIM_DBOPEN: (nil)
-failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
+ locking TESTSUITE/spool/db/retry.lockfile
+ locked  TESTSUITE/spool/db/retry.lockfile
+ EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
+ returned from EXIM_DBOPEN: (nil)
+ failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: 2@b
 unique = 2@b
-no domain retry record
-no address retry record
+no   domain  retry record
+no   address retry record
 2@b: queued for routing
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing 2@b
@@ -463,11 +463,11 @@ After routing:
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> 2@b <--------
-locking TESTSUITE/spool/db/retry.lockfile
-locked  TESTSUITE/spool/db/retry.lockfile
-EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
-returned from EXIM_DBOPEN: (nil)
-failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
+ locking TESTSUITE/spool/db/retry.lockfile
+ locked  TESTSUITE/spool/db/retry.lockfile
+ EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
+ returned from EXIM_DBOPEN: (nil)
+ failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 search_tidyup called
 changed uid/gid: local delivery to 2 <2@b> transport=t1