Merge branch 'bug/2390-tmpfile-race'

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

diff --git a/test/stderr/0297 b/test/stderr/0297
index 9eb75937fa8b670d119e310966aefdad0f828d05..c2e5c8d358a2dbbecfc8ac1ea81459f5faf8fd69 100644 (file)
--- a/test/stderr/0297
+++ b/test/stderr/0297
@@ -2,7 +2,6 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

-DSN: r1 propagating DSN

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing /a/b/c@myhost.test.ex
 --------> r1 router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing /a/b/c@myhost.test.ex
 --------> r1 router <--------


@@ -21,12 +20,11 @@ r1 router generated /a/b/c
 routed by r1 router
   envelope to: /a/b/c@myhost.test.ex
   transport: <none>
 routed by r1 router
   envelope to: /a/b/c@myhost.test.ex
   transport: <none>

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

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

-DSN: r1 propagating DSN

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing /x/y/z@myhost.test.ex
 --------> r1 router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing /x/y/z@myhost.test.ex
 --------> r1 router <--------


@@ -45,7 +43,7 @@ r1 router generated /x/y/z
 routed by r1 router
   envelope to: /x/y/z@myhost.test.ex
   transport: <none>
 routed by r1 router
   envelope to: /x/y/z@myhost.test.ex
   transport: <none>

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

 LOG: MAIN
   <= fil@ter U=CALLER P=local S=sss
 delivering 10HmaX-0005vi-00
 LOG: MAIN
   <= fil@ter U=CALLER P=local S=sss
 delivering 10HmaX-0005vi-00