Debug: fix showing option name for list (vs. list content)

[exim.git] / test / stderr / 0037

diff --git a/test/stderr/0037 b/test/stderr/0037
index be80a0a51a8398e7ef240b3149c53f1d8cdc4550..03b6c3474cbe545698388cfc30183b3fad75c2ed 100644 (file)
--- a/test/stderr/0037
+++ b/test/stderr/0037
@@ -25,14 +25,17 @@ routing filter-userx@test.ex
 --------> check_vars router <--------
 local_part=filter-userx domain=test.ex
 checking local_parts
 --------> check_vars router <--------
 local_part=filter-userx domain=test.ex
 checking local_parts

+filter-userx in local_parts? no (end of list)

 check_vars router skipped: local_parts mismatch
 --------> fail_read_filter router <--------
 local_part=filter-userx domain=test.ex
 checking local_parts
 check_vars router skipped: local_parts mismatch
 --------> fail_read_filter router <--------
 local_part=filter-userx domain=test.ex
 checking local_parts

+filter-userx in local_parts? no (end of list)

 fail_read_filter router skipped: local_parts mismatch
 --------> prepend_filter router <--------
 local_part=filter-userx domain=test.ex
 checking local_parts
 fail_read_filter router skipped: local_parts mismatch
 --------> prepend_filter router <--------
 local_part=filter-userx domain=test.ex
 checking local_parts

+filter-userx in local_parts? no (end of list)

 prepend_filter router skipped: local_parts mismatch
 --------> userfilter router <--------
 local_part=filter-userx domain=test.ex
 prepend_filter router skipped: local_parts mismatch
 --------> userfilter router <--------
 local_part=filter-userx domain=test.ex


@@ -45,7 +48,7 @@ ssss bytes read from TESTSUITE/aux-var/0037.f-user
 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing
 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing

->>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1240 (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>

 rda_interpret: subprocess yield=0 error=NULL
 userfilter router generated userx@test.ex
   errors_to=NULL transport=NULL
 rda_interpret: subprocess yield=0 error=NULL
 userfilter router generated userx@test.ex
   errors_to=NULL transport=NULL


@@ -63,22 +66,27 @@ routing userx@test.ex
 --------> check_vars router <--------
 local_part=userx domain=test.ex
 checking local_parts
 --------> check_vars router <--------
 local_part=userx domain=test.ex
 checking local_parts

+userx in local_parts? no (end of list)

 check_vars router skipped: local_parts mismatch
 --------> fail_read_filter router <--------
 local_part=userx domain=test.ex
 checking local_parts
 check_vars router skipped: local_parts mismatch
 --------> fail_read_filter router <--------
 local_part=userx domain=test.ex
 checking local_parts

+userx in local_parts? no (end of list)

 fail_read_filter router skipped: local_parts mismatch
 --------> prepend_filter router <--------
 local_part=userx domain=test.ex
 checking local_parts
 fail_read_filter router skipped: local_parts mismatch
 --------> prepend_filter router <--------
 local_part=userx domain=test.ex
 checking local_parts

+userx in local_parts? no (end of list)

 prepend_filter router skipped: local_parts mismatch
 --------> userfilter router <--------
 local_part=userx domain=test.ex
 checking local_parts
 prepend_filter router skipped: local_parts mismatch
 --------> userfilter router <--------
 local_part=userx domain=test.ex
 checking local_parts

+userx in local_parts? no (end of list)

 userfilter router skipped: local_parts mismatch
 --------> user_accept1 router <--------
 local_part=userx domain=test.ex
 checking local_parts
 userfilter router skipped: local_parts mismatch
 --------> user_accept1 router <--------
 local_part=userx domain=test.ex
 checking local_parts

+userx in local_parts? no (end of list)

 user_accept1 router skipped: local_parts mismatch
 --------> user_accept2 router <--------
 local_part=userx domain=test.ex
 user_accept1 router skipped: local_parts mismatch
 --------> user_accept2 router <--------
 local_part=userx domain=test.ex


@@ -90,7 +98,7 @@ set transport appendfile
 queued for appendfile transport: local_part = userx
 domain = test.ex
   errors_to=NULL
 queued for appendfile transport: local_part = userx
 domain = test.ex
   errors_to=NULL

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

 routed by user_accept2 router
   envelope to: userx@test.ex
   transport: appendfile
 routed by user_accept2 router
   envelope to: userx@test.ex
   transport: appendfile


@@ -106,5 +114,5 @@ LOG: MAIN
   => userx <filter-userx@test.ex> R=user_accept2 T=appendfile
 LOG: MAIN
   Completed
   => userx <filter-userx@test.ex> R=user_accept2 T=appendfile
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>