Testsuite: output changes resulting

[exim.git] / test / stderr / 0379

diff --git a/test/stderr/0379 b/test/stderr/0379
index e789d50b5142b4ae04aadbabdaf958dd7b4f0853..06eb15c04e3f1d965a6a2aa241559e6bea76c0a3 100644 (file)
--- a/test/stderr/0379
+++ b/test/stderr/0379
@@ -5,7 +5,6 @@ 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
   <= 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
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config


@@ -130,27 +129,24 @@ After routing:
     defer@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
     defer@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local

-postfork: delivery-local

 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => bbbb <aaaa@myhost.test.ex> R=bc T=t1
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => bbbb <aaaa@myhost.test.ex> R=bc T=t1
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local

-postfork: delivery-local

 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => cccc <aaaa@myhost.test.ex> R=bc T=t1
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => cccc <aaaa@myhost.test.ex> R=bc 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=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (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
 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
+fresh-exec forking for qrun-delivery

 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: defer@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: defer@myhost.test.ex


@@ -180,7 +176,7 @@ After routing:
     defer@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
     defer@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

-fresh-exec forked for qrun delivery: npppp
+fresh-exec forked for qrun-delivery: npppp

 LOG: queue_run MAIN
   End queue run: pid=pppp -qf
 LOG: queue_run MAIN
   End queue run: pid=pppp -qf

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>