Fix $mime_part_count for non-mime message on multi-message connection. Bug 2537

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

diff --git a/test/stderr/0037 b/test/stderr/0037
index 22ee0d210520d0a395016cac3d5ee1e6553ccd04..5136a8f2bb402a40fb6a7c1e0194f6ba620d43f1 100644 (file)
--- a/test/stderr/0037
+++ b/test/stderr/0037
@@ -2,26 +2,15 @@ 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
+dropping to exim gid; retaining priv uid
+rda_interpret (file): 'TESTSUITE/aux-var/0037.F'
+expanded: 'TESTSUITE/aux-var/0037.F'

 ssss bytes read from TESTSUITE/aux-var/0037.F
 data is an Exim filter program
 Filter: start of processing
 ssss bytes read from TESTSUITE/aux-var/0037.F
 data is an Exim filter program
 Filter: start of processing


@@ -50,8 +39,8 @@ local_part=filter-userx domain=test.ex
 checking local_parts
 $home = >/usr<
 calling userfilter router
 checking local_parts
 $home = >/usr<
 calling userfilter router

-rda_interpret (file): TESTSUITE/aux-var/0037.f-user
-expanded: TESTSUITE/aux-var/0037.f-user
+rda_interpret (file): 'TESTSUITE/aux-var/0037.f-user'
+expanded: 'TESTSUITE/aux-var/0037.f-user'

 ssss bytes read from TESTSUITE/aux-var/0037.f-user
 data is an Exim filter program
 Filter: start of processing
 ssss bytes read from TESTSUITE/aux-var/0037.f-user
 data is an Exim filter program
 Filter: start of processing


@@ -116,5 +105,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 >>>>>>>>>>>>>>>>