Fix list-expansion for various domainlists, having included sublist elements. Bug...

[users/heiko/exim.git] / test / stderr / 0315

diff --git a/test/stderr/0315 b/test/stderr/0315
index d31624964ba1df9950a912b5a524f4083615323a..9ff377e8bec8e9c34b276d45d12cfef31e165fe4 100644 (file)
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -32,7 +32,7 @@ set transport t1
 queued for t1 transport: local_part = y
 domain = ten-1.test.ex
   errors_to=NULL
 queued for t1 transport: local_part = y
 domain = ten-1.test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=ten-1.test.ex local_part_data=NULL

 routed by r1 router
   envelope to: y@ten-1.test.ex
   transport: t1
 routed by r1 router
   envelope to: y@ten-1.test.ex
   transport: t1


@@ -55,8 +55,8 @@ LOG: MAIN
   *> y@ten-1.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
   *> y@ten-1.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> 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
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user


@@ -93,7 +93,7 @@ set transport t1
 queued for t1 transport: local_part = y
 domain = ten-2.test.ex
   errors_to=NULL
 queued for t1 transport: local_part = y
 domain = ten-2.test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL

 routed by r2 router
   envelope to: y@ten-2.test.ex
   transport: t1
 routed by r2 router
   envelope to: y@ten-2.test.ex
   transport: t1


@@ -112,7 +112,7 @@ r2 router called for x@ten-2.test.ex
 queued for t1 transport: local_part = x
 domain = ten-2.test.ex
   errors_to=NULL
 queued for t1 transport: local_part = x
 domain = ten-2.test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL

 routed by r2 router
   envelope to: x@ten-2.test.ex
   transport: t1
 routed by r2 router
   envelope to: x@ten-2.test.ex
   transport: t1


@@ -132,5 +132,5 @@ LOG: MAIN
   *> y@ten-2.test.ex R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
   *> y@ten-2.test.ex R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> 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 >>>>>>>>>>>>>>>>