Support "-qGpostgresql -Mvl <id>" and a better exiwhat output

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

diff --git a/test/stderr/0420 b/test/stderr/0420
index fc24272de9fb4b925f0437aefca71c75bd028ac7..42f303134b42a01ab89a3fc69256afc3ade34155 100644 (file)
--- a/test/stderr/0420
+++ b/test/stderr/0420
@@ -20,16 +20,18 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< mail from:<x@y>
-SMTP>> 250 OK\r
+SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 processing "accept"
-accept: condition test succeeded
-SMTP>> 250 Accepted\r
+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\r
+SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 host in ignore_fromline_hosts? no (option unset)
 >>Headers received:
@@ -37,6 +39,7 @@ host in ignore_fromline_hosts? no (option unset)
 search_tidyup called
 >>Headers after rewriting and local additions:
 
+Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 * Received: ; Tue, 2 Mar 1999 09:44:33 +0000
@@ -44,16 +47,18 @@ 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\r
+SMTP>> 250 OK id=10HmaX-0005vi-00
 smtp_setup_msg entered
 SMTP<< mail from:<a@b>
-SMTP>> 250 OK\r
+SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 processing "accept"
-accept: condition test succeeded
-SMTP>> 250 Accepted\r
+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\r
+SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 host in ignore_fromline_hosts? no (option unset)
 >>Headers received:
@@ -61,6 +66,7 @@ host in ignore_fromline_hosts? no (option unset)
 search_tidyup called
 >>Headers after rewriting and local additions:
 
+Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 P Received: some text; Tue, 2 Mar 1999 09:44:33 +0000
@@ -68,10 +74,10 @@ calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN
   <= a@b H=[V4NET.0.0.0] P=smtp S=sss
-SMTP>> 250 OK id=10HmaY-0005vi-00\r
+SMTP>> 250 OK id=10HmaY-0005vi-00
 smtp_setup_msg entered
 SMTP<< quit
-SMTP>> 221 mail.test.ex closing connection\r
+SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.0.0.0] closed by QUIT
 search_tidyup called