debug tidying

[exim.git] / test / stderr / 0218

diff --git a/test/stderr/0218 b/test/stderr/0218
index d7750902744955c4038cb1267a7d947a06e4264e..3171503f9d12ee41e352e46e6292a26ecb575424 100644 (file)
--- a/test/stderr/0218
+++ b/test/stderr/0218
@@ -49,14 +49,14 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 351 Send more
   SMTP>> writing message and terminating "."
   SMTP<< 250 OK
-transport forking for continued-transport interproc
-postfork: continued-transport interproc
-continued-transport interproc forking for continued-transport
+transport forking for continued-transport-interproc
+postfork: continued-transport-interproc
+continued-transport-interproc forking for continued-transport
 postfork: continued-transport
 fresh-exec forked for qrun delivery: npppp
 qrun delivery forked for transport: npppp
-transport forked for continued-transport interproc: npppp
-continued-transport interproc forked for continued-transport: npppp
+transport forked for continued-transport-interproc: npppp
+continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
 LOG: MAIN
   => a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 OK"
@@ -70,13 +70,13 @@ admin user
 dropping to exim gid; retaining priv uid
 delivering 10HmaY-0005vi-00 (queue run pid ppppp)
 R: client  (ACL)
-fresh-exec forking for transport
+continued-transport forking for transport
 postfork: transport
 T: send_to_server  (ACL)
   SMTP>> MAIL FROM:<CALLER@test.ex>
   SMTP>> RCPT TO:<b@test.ex>
   SMTP>> DATA
-fresh-exec forked for transport: npppp
+continued-transport forked for transport: npppp
   SMTP<< 250 OK
   SMTP<< 250 OK
   SMTP<< 351 Send more
@@ -147,9 +147,9 @@ fresh-exec forked for qrun delivery: npppp
 qrun delivery forked for transport: npppp
 LOG: MAIN
   ** a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:<CALLER@test.ex>: 550 NO
-qrun delivery forking for bounce message
-postfork: bounce message
-qrun delivery forked for bounce message: npppp
+qrun delivery forking for bounce-message
+postfork: bounce-message
+qrun delivery forked for bounce-message: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -236,20 +236,20 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 503 Unexpected DATA
   SMTP>> RSET
   SMTP<< 250 OK
-transport forking for continued-transport interproc
-postfork: continued-transport interproc
-continued-transport interproc forking for continued-transport
+transport forking for continued-transport-interproc
+postfork: continued-transport-interproc
+continued-transport-interproc forking for continued-transport
 postfork: continued-transport
 fresh-exec forked for qrun delivery: npppp
 qrun delivery forked for transport: npppp
-transport forked for continued-transport interproc: npppp
-continued-transport interproc forked for continued-transport: npppp
+transport forked for continued-transport-interproc: npppp
+continued-transport-interproc forked for continued-transport: npppp
   SMTP(close)>>
 LOG: MAIN
   ** b@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@test.ex>: 550 Unknown
-qrun delivery forking for bounce message
-postfork: bounce message
-qrun delivery forked for bounce message: npppp
+qrun delivery forking for bounce-message
+postfork: bounce-message
+qrun delivery forked for bounce-message: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -267,13 +267,13 @@ admin user
 dropping to exim gid; retaining priv uid
 delivering 10HmbC-0005vi-00 (queue run pid ppppp)
 R: client  (ACL)
-fresh-exec forking for transport
+continued-transport forking for transport
 postfork: transport
 T: send_to_server  (ACL)
   SMTP>> MAIL FROM:<CALLER@test.ex>
   SMTP>> RCPT TO:<c@test.ex>
   SMTP>> DATA
-fresh-exec forked for transport: npppp
+continued-transport forked for transport: npppp
   SMTP<< 250 OK
   SMTP<< 250 OK
   SMTP<< 351 OK