Testsuite: better non-TFO-system debug handling

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

diff --git a/test/stderr/0149 b/test/stderr/0149
index 986177b4593f788400906495fd165547e28ea4e0..903b3b786009a72c4e0bb3ffaeb5b20e7c5ba0ae 100644 (file)
--- a/test/stderr/0149
+++ b/test/stderr/0149
@@ -1,9 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

-DSN: domainlist1 propagating DSN
-DSN: domainlist2 propagating DSN
-DSN: local propagating DSN

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing x@ten
 --------> domainlist1 router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing x@ten
 --------> domainlist1 router <--------


@@ -13,8 +10,8 @@ calling domainlist1 router
 domainlist1 router called for x@ten
   domain = ten
 route_item = ten <+V4NET.0.0.0+V4NET.0.0.1 byname
 domainlist1 router called for x@ten
   domain = ten
 route_item = ten <+V4NET.0.0.0+V4NET.0.0.1 byname

-original list of hosts = "<+V4NET.0.0.0+V4NET.0.0.1" options = byname
-expanded list of hosts = "<+V4NET.0.0.0+V4NET.0.0.1" options = byname
+original list of hosts = '<+V4NET.0.0.0+V4NET.0.0.1' options = 'byname'
+expanded list of hosts = '<+V4NET.0.0.0+V4NET.0.0.1' options = 'byname'

 finding IP address for V4NET.0.0.0
 calling host_find_byname
 finding IP address for V4NET.0.0.1
 finding IP address for V4NET.0.0.0
 calling host_find_byname
 finding IP address for V4NET.0.0.1


@@ -38,8 +35,8 @@ domainlist1 router called for y@two
   domain = two
 route_item = ten <+V4NET.0.0.0+V4NET.0.0.1 byname
 route_item = two   V4NET.0.0.2:V4NET.0.0.4 byname
   domain = two
 route_item = ten <+V4NET.0.0.0+V4NET.0.0.1 byname
 route_item = two   V4NET.0.0.2:V4NET.0.0.4 byname

-original list of hosts = "V4NET.0.0.2:V4NET.0.0.4" options = byname
-expanded list of hosts = "V4NET.0.0.2:V4NET.0.0.4" options = byname
+original list of hosts = 'V4NET.0.0.2:V4NET.0.0.4' options = 'byname'
+expanded list of hosts = 'V4NET.0.0.2:V4NET.0.0.4' options = 'byname'

 finding IP address for V4NET.0.0.2
 calling host_find_byname
 finding IP address for V4NET.0.0.4
 finding IP address for V4NET.0.0.2
 calling host_find_byname
 finding IP address for V4NET.0.0.4


@@ -139,8 +136,8 @@ domainlist2 router called for x@one
   domain = one
 route_item = six <+V4NET.0.0.6+V4NET.0.0.7 byname
 route_item = one   V4NET.0.0.2:V4NET.0.0.4 byname
   domain = one
 route_item = six <+V4NET.0.0.6+V4NET.0.0.7 byname
 route_item = one   V4NET.0.0.2:V4NET.0.0.4 byname

-original list of hosts = "V4NET.0.0.2:V4NET.0.0.4" options = byname
-expanded list of hosts = "V4NET.0.0.2:V4NET.0.0.4" options = byname
+original list of hosts = 'V4NET.0.0.2:V4NET.0.0.4' options = 'byname'
+expanded list of hosts = 'V4NET.0.0.2:V4NET.0.0.4' options = 'byname'

 finding IP address for V4NET.0.0.2
 calling host_find_byname
 finding IP address for V4NET.0.0.4
 finding IP address for V4NET.0.0.2
 calling host_find_byname
 finding IP address for V4NET.0.0.4


@@ -172,8 +169,8 @@ calling domainlist2 router
 domainlist2 router called for x@six
   domain = six
 route_item = six <+V4NET.0.0.6+V4NET.0.0.7 byname
 domainlist2 router called for x@six
   domain = six
 route_item = six <+V4NET.0.0.6+V4NET.0.0.7 byname

-original list of hosts = "<+V4NET.0.0.6+V4NET.0.0.7" options = byname
-expanded list of hosts = "<+V4NET.0.0.6+V4NET.0.0.7" options = byname
+original list of hosts = '<+V4NET.0.0.6+V4NET.0.0.7' options = 'byname'
+expanded list of hosts = '<+V4NET.0.0.6+V4NET.0.0.7' options = 'byname'

 finding IP address for V4NET.0.0.6
 calling host_find_byname
 finding IP address for V4NET.0.0.7
 finding IP address for V4NET.0.0.6
 calling host_find_byname
 finding IP address for V4NET.0.0.7


@@ -187,4 +184,4 @@ routed by domainlist2 router
   transport: <none>
   host V4NET.0.0.6 [V4NET.0.0.6]
   host V4NET.0.0.7 [V4NET.0.0.7]
   transport: <none>
   host V4NET.0.0.6 [V4NET.0.0.6]
   host V4NET.0.0.7 [V4NET.0.0.7]

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