X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/568092148bf6ade68174fa1ccf34b8c37d9064e9..cd8cb71deb2d653228cc037cf91ecab980acdcd0:/test/stderr/0377 diff --git a/test/stderr/0377 b/test/stderr/0377 index 91d58ecad..192d87f43 100644 --- a/test/stderr/0377 +++ b/test/stderr/0377 @@ -4,9 +4,6 @@ admin user LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log -fresh-exec forking for local-accept delivery -postfork: local-accept delivery -fresh-exec forked for local-accept delivery: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -209,7 +206,7 @@ set transport t1 queued for t1 transport: local_part = cccc domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=cccc routed by cccc_accept router envelope to: cccc@myhost.test.ex transport: t1 @@ -254,7 +251,7 @@ set transport t1 queued for t1 transport: local_part = bbbb domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=bbbb routed by bbbb_0 router envelope to: bbbb@myhost.test.ex transport: t1 @@ -285,7 +282,7 @@ set transport t1 queued for t1 transport: local_part = aaaa domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=aaaa routed by seen_aaaa router envelope to: aaaa@myhost.test.ex transport: t1 @@ -302,34 +299,23 @@ After routing: defer_bbbb@myhost.test.ex defer_cccc@myhost.test.ex locking TESTSUITE/spool/db/retry.lockfile -fresh-exec forking for delivery (local) -postfork: delivery (local) -fresh-exec forked for delivery (local): npppp LOG: MAIN => aaaa R=seen_aaaa T=t1 locking TESTSUITE/spool/db/retry.lockfile -fresh-exec forking for delivery (local) -postfork: delivery (local) -fresh-exec forked for delivery (local): npppp LOG: MAIN => bbbb R=bbbb_0 T=t1 locking TESTSUITE/spool/db/retry.lockfile -fresh-exec forking for delivery (local) -postfork: delivery (local) -fresh-exec forked for delivery (local): npppp LOG: MAIN => cccc R=cccc_accept T=t1 locking TESTSUITE/spool/db/retry.lockfile ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp -qf -fresh-exec forking for qrun delivery -postfork: qrun delivery + Start queue run: pid=p1234 -qf locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: aaaa@myhost.test.ex @@ -410,7 +396,7 @@ set transport t1 queued for t1 transport: local_part = bbbb domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=bbbb routed by bbbb_0 router envelope to: bbbb@myhost.test.ex transport: t1 @@ -435,7 +421,7 @@ set transport t1 queued for t1 transport: local_part = aaaa domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=aaaa routed by seen_aaaa router envelope to: aaaa@myhost.test.ex transport: t1 @@ -547,7 +533,7 @@ set transport t1 queued for t1 transport: local_part = cccc domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=cccc routed by cccc_accept router envelope to: cccc@myhost.test.ex transport: t1 @@ -565,19 +551,16 @@ cccc@myhost.test.ex was previously delivered (t1 transport): discarded aaaa@myhost.test.ex was previously delivered (t1 transport): discarded bbbb@myhost.test.ex was previously delivered (t1 transport): discarded locking TESTSUITE/spool/db/retry.lockfile ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -fresh-exec forked for qrun delivery: npppp +>>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp -qf ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 -qf +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp -qf -fresh-exec forking for qrun delivery -postfork: qrun delivery + Start queue run: pid=p1235 -qf locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: aaaa@myhost.test.ex @@ -658,7 +641,7 @@ set transport t1 queued for t1 transport: local_part = bbbb domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=bbbb routed by bbbb_0 router envelope to: bbbb@myhost.test.ex transport: t1 @@ -683,7 +666,7 @@ set transport t1 queued for t1 transport: local_part = aaaa domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=aaaa routed by seen_aaaa router envelope to: aaaa@myhost.test.ex transport: t1 @@ -795,7 +778,7 @@ set transport t1 queued for t1 transport: local_part = cccc domain = myhost.test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=cccc routed by cccc_accept router envelope to: cccc@myhost.test.ex transport: t1 @@ -813,8 +796,7 @@ cccc@myhost.test.ex was previously delivered (t1 transport): discarded aaaa@myhost.test.ex was previously delivered (t1 transport): discarded bbbb@myhost.test.ex was previously delivered (t1 transport): discarded locking TESTSUITE/spool/db/retry.lockfile ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -fresh-exec forked for qrun delivery: npppp +>>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp -qf ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1235 -qf +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>