Testsuite: munging

[exim.git] / test / stderr / 0575

diff --git a/test/stderr/0575 b/test/stderr/0575
index 86620a896a753e0ef3759cf34efdff4e8c8310de..7e6ac1c3e18fe55e66571fda187450884b26ef6d 100644 (file)
--- a/test/stderr/0575
+++ b/test/stderr/0575
@@ -27,15 +27,13 @@ spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>

-processing "accept"
+processing "accept" (TESTSUITE/test-config 13)

 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted

-DSN: orcpt: NULL  flags: 0

 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called

-host in ignore_fromline_hosts? no (option unset)

 >>Headers received:
 
 search_tidyup called
 >>Headers received:
 
 search_tidyup called


@@ -49,8 +47,6 @@ P Received: from [V4NET.0.0.0]
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-calling local_scan(); timeout=300
-local_scan() returned 0 NULL

 LOG: MAIN
   <= x@y H=[V4NET.0.0.0] P=smtp S=sss
 SMTP>> 250 OK id=10HmaX-0005vi-00
 LOG: MAIN
   <= x@y H=[V4NET.0.0.0] P=smtp S=sss
 SMTP>> 250 OK id=10HmaX-0005vi-00


@@ -60,4 +56,4 @@ SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.0.0.0] closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.0.0.0] closed by QUIT
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>