Fix string_copy() macro to not multiple-eval args. Bug 2603

[exim.git] / test / stderr / 0037

diff --git a/test/stderr/0037 b/test/stderr/0037
index 8a1a1ce17a56dbbae8e68abaa5dc609a0b741bf1..be80a0a51a8398e7ef240b3149c53f1d8cdc4550 100644 (file)
--- a/test/stderr/0037
+++ b/test/stderr/0037
@@ -4,8 +4,6 @@ trusted user
 admin user
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 admin user
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss

-fresh-exec forking for local-accept-delivery
-fresh-exec forked for local-accept-delivery: npppp

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user


@@ -43,13 +41,11 @@ $home = >/usr<
 calling userfilter router
 rda_interpret (file): 'TESTSUITE/aux-var/0037.f-user'
 expanded: 'TESTSUITE/aux-var/0037.f-user'
 calling userfilter router
 rda_interpret (file): 'TESTSUITE/aux-var/0037.f-user'
 expanded: 'TESTSUITE/aux-var/0037.f-user'

-local-accept-delivery forking for router-interpret

 ssss bytes read from TESTSUITE/aux-var/0037.f-user
 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing
 >>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
 ssss bytes read from TESTSUITE/aux-var/0037.f-user
 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing
 >>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>

-local-accept-delivery forked for router-interpret: npppp

 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


@@ -94,7 +90,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=NULL
+  domain_data=NULL localpart_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,8 +102,6 @@ After routing:
   Failed addresses:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
   Failed addresses:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile

-local-accept-delivery forking for delivery-local
-local-accept-delivery forked for delivery-local: npppp

 LOG: MAIN
   => userx <filter-userx@test.ex> R=user_accept2 T=appendfile
 LOG: MAIN
 LOG: MAIN
   => userx <filter-userx@test.ex> R=user_accept2 T=appendfile
 LOG: MAIN