X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fstderr%2F0464;h=512ed1b5843f5c4f59d5a047cb3a782353c99395;hb=340cbb7f4ea5185938b16a75cff05dea504a434a;hp=32160e76efdbabebb54c68894df8855f05c08ca1;hpb=ddf1b11a732e293cd242c80bc63d459dda595bf4;p=exim.git

diff --git a/test/stderr/0464 b/test/stderr/0464
index 32160e76e..512ed1b58 100644
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -5,8 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 set_process_info: pppp accepting a local SMTP message from <CALLER@myhost.test.ex>
@@ -17,11 +15,11 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< mail from:<>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@domain1>
 using ACL "rcpt"
-processing "require"
+processing "require" (TESTSUITE/test-config 20)
 check domains = +special_domains
 search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
 search_find: file="TESTSUITE/aux-fixed/0464.domains"
@@ -51,8 +49,8 @@ cached yes match for +special_domains
 cached lookup data = data for domain1
 domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
 calling r1 router
-rda_interpret (string): $local_part@xxx.$domain
-expanded: abc@xxx.domain1
+rda_interpret (string): '$local_part@xxx.$domain'
+expanded: 'abc@xxx.domain1'
 file is not a filter file
 parse_forward_list: abc@xxx.domain1
 extract item: abc@xxx.domain1
@@ -99,7 +97,7 @@ routed by r2 router
   transport: smtp
 ----------- end verify ------------
 require: condition test succeeded in ACL "rcpt"
-processing "require"
+processing "require" (TESTSUITE/test-config 23)
 check domains = +special_domains
 cached yes match for +special_domains
 cached lookup data = data for domain1
@@ -118,8 +116,8 @@ cached yes match for +special_domains
 cached lookup data = data for domain1
 domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
 calling r1 router
-rda_interpret (string): $local_part@xxx.$domain
-expanded: abc@xxx.domain1
+rda_interpret (string): '$local_part@xxx.$domain'
+expanded: 'abc@xxx.domain1'
 file is not a filter file
 parse_forward_list: abc@xxx.domain1
 extract item: abc@xxx.domain1
@@ -165,7 +163,7 @@ routed by r2 router
   transport: smtp
 ----------- end verify ------------
 require: condition test succeeded in ACL "rcpt"
-processing "accept"
+processing "accept" (TESTSUITE/test-config 25)
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted
@@ -175,4 +173,4 @@ SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>