X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/50dc740948ba43eaeb6d33757bc83beff33f2a64..b4a37a77271a8f6efc887d68265eb7867eff6170:/test/stderr/0161?ds=inline

diff --git a/test/stderr/0161 b/test/stderr/0161
index 3a806f3de..c8e182322 100644
--- a/test/stderr/0161
+++ b/test/stderr/0161
@@ -1,11 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@mxt6.test.ex
 --------> failuphost router <--------
@@ -28,15 +23,10 @@ routed by lookuphost router
   envelope to: xx@mxt6.test.ex
   transport: remote_smtp
   host ten-1.test.ex [V4NET.0.0.1] MX=5
->>>>>>>>>>>>>>>> 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
 admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing myhost.test.ex@mxt1.test.ex
 --------> failuphost router <--------
@@ -65,8 +55,8 @@ calling self router
 self router called for myhost.test.ex@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * $local_part byname
-original list of hosts = "$local_part" options = byname
-expanded list of hosts = "myhost.test.ex" options = byname
+original list of hosts = '$local_part' options = 'byname'
+expanded list of hosts = 'myhost.test.ex' options = 'byname'
 set transport remote_smtp
 finding IP address for myhost.test.ex
 calling host_find_byname
@@ -78,15 +68,10 @@ routed by self router
   envelope to: myhost.test.ex@mxt1.test.ex
   transport: remote_smtp
   host myhost.test.ex [V4NET.10.10.10]
->>>>>>>>>>>>>>>> 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
 admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@mxt1.test.ex
 --------> failuphost router <--------
@@ -115,8 +100,8 @@ calling self router
 self router called for xx@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * $local_part byname
-original list of hosts = "$local_part" options = byname
-expanded list of hosts = "xx" options = byname
+original list of hosts = '$local_part' options = 'byname'
+expanded list of hosts = 'xx' options = 'byname'
 set transport remote_smtp
 finding IP address for xx
 calling host_find_byname
@@ -129,8 +114,8 @@ calling self2 router
 self2 router called for xx@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * myhost.test.ex byname
-original list of hosts = "myhost.test.ex" options = byname
-expanded list of hosts = "myhost.test.ex" options = byname
+original list of hosts = 'myhost.test.ex' options = 'byname'
+expanded list of hosts = 'myhost.test.ex' options = 'byname'
 set transport remote_smtp
 finding IP address for myhost.test.ex
 calling host_find_byname
@@ -142,15 +127,10 @@ routed by self2 router
   envelope to: xx@mxt1.test.ex
   transport: remote_smtp
   host myhost.test.ex [V4NET.10.10.10]
->>>>>>>>>>>>>>>> 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
 admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@not.exist
 --------> failuphost router <--------
@@ -167,15 +147,10 @@ lookuphost router called for xx@not.exist
 lookuphost router declined for xx@not.exist
 "more" is false: skipping remaining routers
 no more routers
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing ff@mxt1.test.ex
 --------> failuphost router <--------
@@ -187,15 +162,10 @@ failuphost router called for ff@mxt1.test.ex
   domain = mxt1.test.ex
 lowest numbered MX record points to local host: mxt1.test.ex: address failed (self = fail)
 failuphost router forced address failure
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing fff@mxt1.test.ex
 --------> failuphost router <--------
@@ -220,10 +190,10 @@ calling fail router
 fail router called for fff@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * $local_part byname
-original list of hosts = "$local_part" options = byname
-expanded list of hosts = "fff" options = byname
+original list of hosts = '$local_part' options = 'byname'
+expanded list of hosts = 'fff' options = 'byname'
 set transport remote_smtp
 finding IP address for fff
 calling host_find_byname
 fail router forced address failure
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>