Merge branch 'debug_fork'

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

diff --git a/test/stderr/2201 b/test/stderr/2201
index a21b3e9dd69139711f9ab690673db08887c4d86a..405818c0792126a18ce6bc3b02d8cf41066e269b 100644 (file)
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -153,7 +153,7 @@ routed by r2 router
   envelope to: unknown@test.ex
   transport: local_delivery
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -198,7 +198,7 @@ LOG: MAIN
   <= a@shorthost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 
 ******** SERVER ********
 Exim version x.yz ....
@@ -217,29 +217,29 @@ ppppp   exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on
 ppppp daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 ppppp Listening...
 ppppp Connection request from 127.0.0.1 port sssss
-ppppp fresh-exec forking for daemon accept
-ppppp postfork: daemon accept
+ppppp daemon forking for daemon-accept
+ppppp postfork: daemon-accept
 ppppp Process ppppp is handling incoming connection from [127.0.0.1]
 ppppp Process ppppp is ready for new message
-ppppp daemon accept forking for fakens-search
+ppppp daemon-accept forking for fakens-search
 ppppp postfork: fakens-search
-ppppp fresh-exec forked for daemon accept: npppp
+ppppp daemon forked for daemon-accept: npppp
 ppppp 1 SMTP accept process running
 ppppp Listening...
-ppppp daemon accept forked for fakens-search: npppp
-ppppp daemon accept forking for fakens-search
+ppppp daemon-accept forked for fakens-search: npppp
+ppppp daemon-accept forking for fakens-search
 ppppp postfork: fakens-search
-ppppp daemon accept forked for fakens-search: npppp
+ppppp daemon-accept forked for fakens-search: npppp
 ppppp dnslists check: rbl.test.ex/V4NET.11.12.14
 ppppp new DNS lookup for 14.12.11.V4NET.rbl.test.ex
-ppppp daemon accept forking for fakens-search
+ppppp daemon-accept forking for fakens-search
 ppppp postfork: fakens-search
-ppppp daemon accept forked for fakens-search: npppp
+ppppp daemon-accept forked for fakens-search: npppp
 ppppp dnslists: wrote cache entry, ttl=2
 ppppp DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
-ppppp daemon accept forking for fakens-search
+ppppp daemon-accept forking for fakens-search
 ppppp postfork: fakens-search
-ppppp daemon accept forked for fakens-search: npppp
+ppppp daemon-accept forked for fakens-search: npppp
 ppppp => that means V4NET.11.12.14 is listed at rbl.test.ex
 ppppp dnslists check: rbl.test.ex/V4NET.11.12.14
 ppppp dnslists: using result of previous lookup
@@ -247,26 +247,26 @@ ppppp DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
 ppppp => that means V4NET.11.12.14 is listed at rbl.test.ex
 ppppp dnslists check: rbl.test.ex/V4NET.11.12.14
 ppppp cached data found but past valid time; new DNS lookup for 14.12.11.V4NET.rbl.test.ex
-ppppp daemon accept forking for fakens-search
+ppppp daemon-accept forking for fakens-search
 ppppp postfork: fakens-search
-ppppp daemon accept forked for fakens-search: npppp
+ppppp daemon-accept forked for fakens-search: npppp
 ppppp dnslists: wrote cache entry, ttl=2
 ppppp DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
-ppppp daemon accept forking for fakens-search
+ppppp daemon-accept forking for fakens-search
 ppppp postfork: fakens-search
-ppppp daemon accept forked for fakens-search: npppp
+ppppp daemon-accept forked for fakens-search: npppp
 ppppp => that means V4NET.11.12.14 is listed at rbl.test.ex
 ppppp LOG: MAIN
 ppppp   <= a@shorthost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex
 ppppp Process ppppp is ready for new message
 ppppp LOG: smtp_connection MAIN
 ppppp   SMTP connection from localhost (myhost.test.ex) [127.0.0.1] closed by QUIT
-ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (conn-setup) terminating with rc=0 >>>>>>>>>>>>>>>>
+ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
 ppppp child ppppp ended: status=0x0
 ppppp   normal exit, 0
 ppppp 0 SMTP accept processes now running
 ppppp Listening...
-ppppp fresh-exec forking for daemon-del-pidfile
+ppppp daemon forking for daemon-del-pidfile
 ppppp postfork: daemon-del-pidfile
-ppppp fresh-exec forked for daemon-del-pidfile: npppp
+ppppp daemon forked for daemon-del-pidfile: npppp
 ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>