Hintsdb: USE_SQLITE build option

[exim.git] / test / stderr / 0380

diff --git a/test/stderr/0380 b/test/stderr/0380
index c653fc309344736e4cf70a72bf1d4dd0afdfbd17..efbad7565b747536ad6b0f77f2dff78a7c1e71af 100644 (file)
--- a/test/stderr/0380
+++ b/test/stderr/0380
@@ -1,10 +1,12 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

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

+Hints DB:

 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user


@@ -28,12 +30,13 @@ forced failure in expansion of "${if eq {a}{b}{x}fail}" (address_data): decline
 --------> r1 router <--------
 local_part=bbbb domain=myhost.test.ex
 checking local_parts
 --------> r1 router <--------
 local_part=bbbb domain=myhost.test.ex
 checking local_parts

+bbbb in local_parts? no (end of list)

 r1 router skipped: local_parts mismatch
 --------> r2 router <--------
 local_part=bbbb domain=myhost.test.ex
 checking local_parts
 calling r2 router
 r1 router skipped: local_parts mismatch
 --------> r2 router <--------
 local_part=bbbb domain=myhost.test.ex
 checking local_parts
 calling r2 router

-rda_interpret (file): 'TESTSUITE/non-exist/$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


@@ -47,7 +50,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


@@ -61,7 +64,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/$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,5 +85,5 @@ locking TESTSUITE/spool/db/retry.lockfile
 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

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>