Fix include_directory in redirect routers. Bug 2715

[exim.git] / test / stderr / 0380

diff --git a/test/stderr/0380 b/test/stderr/0380
index 2e84ee4fa8ef1441d12448f505863ff2ac62928b..b4a0af0caaff41698837a3e8fa6f6ac26db3b29f 100644 (file)
--- a/test/stderr/0380
+++ b/test/stderr/0380
@@ -4,9 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log

-fresh-exec forking for local-accept-delivery
-postfork: 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


@@ -36,7 +33,7 @@ r1 router skipped: local_parts mismatch
 local_part=bbbb domain=myhost.test.ex
 checking local_parts
 calling r2 router
 local_part=bbbb domain=myhost.test.ex
 checking local_parts
 calling r2 router

-rda_interpret (file): 'TESTSUITE/non-exist/${bless:$local_part}'
+rda_interpret (file): 'TESTSUITE/non-exist/bbbb'

 expanded: 'TESTSUITE/non-exist/bbbb'
 TESTSUITE/non-exist/bbbb does not exist
 ignore_enotdir set => skip checking parent directory
 expanded: 'TESTSUITE/non-exist/bbbb'
 TESTSUITE/non-exist/bbbb does not exist
 ignore_enotdir set => skip checking parent directory


@@ -50,7 +47,7 @@ set transport t1
 queued for t1 transport: local_part = bbbb
 domain = myhost.test.ex
   errors_to=NULL
 queued for t1 transport: local_part = bbbb
 domain = myhost.test.ex
   errors_to=NULL

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

 routed by r3 router
   envelope to: bbbb@myhost.test.ex
   transport: t1
 routed by r3 router
   envelope to: bbbb@myhost.test.ex
   transport: t1


@@ -64,7 +61,7 @@ forced failure in expansion of "${if eq {a}{b}{x}fail}" (address_data): decline
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
 calling r1 router
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
 calling r1 router

-rda_interpret (file): 'TESTSUITE/non-exist/${bless:$local_part}'
+rda_interpret (file): 'TESTSUITE/non-exist/aaaa'

 expanded: 'TESTSUITE/non-exist/aaaa'
 TESTSUITE/non-exist/aaaa does not exist
 checking parent directory
 expanded: 'TESTSUITE/non-exist/aaaa'
 TESTSUITE/non-exist/aaaa does not exist
 checking parent directory


@@ -82,9 +79,6 @@ After routing:
   Deferred addresses:
     aaaa@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile
   Deferred addresses:
     aaaa@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile

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

 LOG: MAIN
   => bbbb <bbbb@myhost.test.ex> R=r3 T=t1
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   => bbbb <bbbb@myhost.test.ex> R=r3 T=t1
 locking TESTSUITE/spool/db/retry.lockfile