Testsuite: another go at munging cipher-suite strings

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

diff --git a/test/stderr/0037 b/test/stderr/0037
index 16887887348203117a69cec04decaddd49b75853..1d03f0d480e87ce836680972cece57dada0b1cb5 100644 (file)
--- a/test/stderr/0037
+++ b/test/stderr/0037
@@ -2,12 +2,24 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

+DSN: check_vars propagating DSN
+DSN: fail_read_filter propagating DSN
+DSN: prepend_filter propagating DSN
+DSN: userfilter propagating DSN
+DSN: user_accept1 propagating DSN
+DSN: user_accept2 propagating DSN

 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

+DSN: check_vars propagating DSN
+DSN: fail_read_filter propagating DSN
+DSN: prepend_filter propagating DSN
+DSN: userfilter propagating DSN
+DSN: user_accept1 propagating DSN
+DSN: user_accept2 propagating DSN

 rda_interpret (file): TESTSUITE/aux-var/0037.F
 expanded: TESTSUITE/aux-var/0037.F
 ssss bytes read from TESTSUITE/aux-var/0037.F
 rda_interpret (file): TESTSUITE/aux-var/0037.F
 expanded: TESTSUITE/aux-var/0037.F
 ssss bytes read from TESTSUITE/aux-var/0037.F


@@ -29,6 +41,10 @@ check_vars router skipped: local_parts mismatch
 local_part=filter-userx domain=test.ex
 checking local_parts
 fail_read_filter router skipped: local_parts mismatch
 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
+prepend_filter router skipped: local_parts mismatch

 --------> userfilter router <--------
 local_part=filter-userx domain=test.ex
 checking local_parts
 --------> userfilter router <--------
 local_part=filter-userx domain=test.ex
 checking local_parts


@@ -62,6 +78,10 @@ check_vars router skipped: local_parts mismatch
 local_part=userx domain=test.ex
 checking local_parts
 fail_read_filter router skipped: local_parts mismatch
 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
+prepend_filter router skipped: local_parts mismatch

 --------> userfilter router <--------
 local_part=userx domain=test.ex
 checking local_parts
 --------> userfilter router <--------
 local_part=userx domain=test.ex
 checking local_parts


@@ -96,5 +116,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 terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>