Testsuite: better non-TFO-system debug handling

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

diff --git a/test/stderr/0161 b/test/stderr/0161
index 0147fcb6ff93c119240721d34b35ab358581a97b..88f106933fe17da497c53eb14d1663c87bf44d43 100644 (file)
--- a/test/stderr/0161
+++ b/test/stderr/0161
@@ -1,11 +1,7 @@
 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
+dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@mxt6.test.ex
 --------> failuphost router <--------
@@ -32,11 +28,7 @@ routed by lookuphost router
 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
+dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing myhost.test.ex@mxt1.test.ex
 --------> failuphost router <--------
@@ -65,8 +57,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
@@ -82,11 +74,7 @@ routed by self router
 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
+dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@mxt1.test.ex
 --------> failuphost router <--------
@@ -115,8 +103,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 +117,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
@@ -146,11 +134,7 @@ routed by self2 router
 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
+dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@not.exist
 --------> failuphost router <--------
@@ -171,11 +155,7 @@ no more routers
 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
+dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing ff@mxt1.test.ex
 --------> failuphost router <--------
@@ -191,11 +171,7 @@ failuphost router forced address failure
 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
+dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing fff@mxt1.test.ex
 --------> failuphost router <--------
@@ -220,8 +196,8 @@ 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