Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / stderr / 0084

diff --git a/test/stderr/0084 b/test/stderr/0084
index 4100ebe9ede8ef37120e341a4132a8e23e3ac87d..3f15cbc8f087f5084b401d59069826877322c606 100644 (file)
--- a/test/stderr/0084
+++ b/test/stderr/0084
@@ -17,8 +17,8 @@ file check: TESTSUITE/aux-fixed/0084.$local_part
 expanded file: TESTSUITE/aux-fixed/0084.yes
 stat() yielded 0
 calling forward router
 expanded file: TESTSUITE/aux-fixed/0084.yes
 stat() yielded 0
 calling forward router

-rda_interpret (file): TESTSUITE/aux-fixed/0084.$local_part
-expanded: TESTSUITE/aux-fixed/0084.yes
+rda_interpret (file): 'TESTSUITE/aux-fixed/0084.${bless:$local_part}'
+expanded: 'TESTSUITE/aux-fixed/0084.yes'

 ssss bytes read from TESTSUITE/aux-fixed/0084.yes
 file is not a filter file
 parse_forward_list: userx@test.ex
 ssss bytes read from TESTSUITE/aux-fixed/0084.yes
 file is not a filter file
 parse_forward_list: userx@test.ex


@@ -41,7 +41,7 @@ localuser router called for userx@test.ex
 queued for <unset> transport: local_part = userx
 domain = test.ex
   errors_to=NULL
 queued for <unset> transport: local_part = userx
 domain = test.ex
   errors_to=NULL

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

 routed by localuser router
   envelope to: userx@test.ex
   transport: <none>
 routed by localuser router
   envelope to: userx@test.ex
   transport: <none>


@@ -53,15 +53,15 @@ checking require_files
 file check: ! TESTSUITE/aux-fixed/0084.$local_part
 expanded file: TESTSUITE/aux-fixed/0084.no
 stat() yielded -1
 file check: ! TESTSUITE/aux-fixed/0084.$local_part
 expanded file: TESTSUITE/aux-fixed/0084.no
 stat() yielded -1

-errno = 2
+errno = EEE

 calling smart router
 smart router called for no@myhost.test.ex
   domain = myhost.test.ex
 queued for <unset> transport: local_part = no
 domain = myhost.test.ex
   errors_to=NULL
 calling smart router
 smart router called for no@myhost.test.ex
   domain = myhost.test.ex
 queued for <unset> transport: local_part = no
 domain = myhost.test.ex
   errors_to=NULL

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

 routed by smart router
   envelope to: no@myhost.test.ex
   transport: <none>
 routed by smart router
   envelope to: no@myhost.test.ex
   transport: <none>

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