X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/54c5ebb14ead7439af300e9d7d9d7d2ba29ff32e..114b01dded2c9d72cdd44cac97a4d3cc9f22ddfd:/test/stderr/0317

diff --git a/test/stderr/0317 b/test/stderr/0317
index 4a28f2620..b736cd160 100644
--- a/test/stderr/0317
+++ b/test/stderr/0317
@@ -3,6 +3,8 @@ configuration file is TESTSUITE/test-config
 admin user
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
+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
 Sender: CALLER@test.ex
 >>Headers received:
 To: x@y.z
@@ -10,31 +12,34 @@ Cc: a@b.c
 Bcc: p@q.r
 
 >>Headers after rewriting and local additions:
-T To: x@y.z
-C Cc: a@b.c
-* Bcc: p@q.r
-I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
-F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ T To: x@y.z
+ C Cc: a@b.c
+ * Bcc: p@q.r
+ I Message-Id: <E10HmaX-000000005vi-0000@mail.test.ex>
+ F From: CALLER_NAME <CALLER@test.ex>
+   Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-Data file written for message 10HmaX-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D
+Data file written for message 10HmaX-000000005vi-0000
 >>Generated Received: header line
 P Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
-Writing spool header file
+	id 10HmaX-000000005vi-0000;
+	Tue, 2 Mar 1999 09:44:33 +0000
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000
+Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
+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
 Sender: CALLER@test.ex
 >>Headers received:
 To: x@y.z
@@ -45,25 +50,26 @@ Resent-cc: pp@qq.rr
 Resent-bcc: xx@yy.zz
 
 >>Headers after rewriting and local additions:
-T To: x@y.z
-C Cc: a@b.c
-B Bcc: p@q.r
-T Resent-to: aa@bb.cc
-C Resent-cc: pp@qq.rr
-* Resent-bcc: xx@yy.zz
-I Resent-Message-Id: <E10HmaY-0005vi-00@mail.test.ex>
-F Resent-From: CALLER_NAME <CALLER@test.ex>
-  Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
+   Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
+ I Resent-Message-Id: <E10HmaY-000000005vi-0000@mail.test.ex>
+ T To: x@y.z
+ C Cc: a@b.c
+ B Bcc: p@q.r
+ T Resent-to: aa@bb.cc
+ C Resent-cc: pp@qq.rr
+ * Resent-bcc: xx@yy.zz
+ F Resent-From: CALLER_NAME <CALLER@test.ex>
 
-Data file written for message 10HmaY-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D
+Data file written for message 10HmaY-000000005vi-0000
 >>Generated Received: header line
 P Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
-Writing spool header file
+	id 10HmaY-000000005vi-0000;
+	Tue, 2 Mar 1999 09:44:33 +0000
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000
+Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>