Sqlite: new-style option to specify db file

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

diff --git a/test/stderr/0379 b/test/stderr/0379
index 26a225fe2d27dbec6196585bfa9d698c8224fd85..db55abea0037ce66453658d35e312c880d9b92f8 100644 (file)
--- a/test/stderr/0379
+++ b/test/stderr/0379
@@ -30,7 +30,7 @@ local_part=aaaa domain=myhost.test.ex
 checking local_parts
 calling aaaa_redirect router
 rda_interpret (string): 'bbbb@$domain, cccc@$domain'
 checking local_parts
 calling aaaa_redirect router
 rda_interpret (string): 'bbbb@$domain, cccc@$domain'

-expanded: 'bbbb@myhost.test.ex, cccc@myhost.test.ex'
+expanded: 'bbbb@myhost.test.ex, cccc@myhost.test.ex' (tainted)

 file is not a filter file
 parse_forward_list: bbbb@myhost.test.ex, cccc@myhost.test.ex
 extract item: bbbb@myhost.test.ex
 file is not a filter file
 parse_forward_list: bbbb@myhost.test.ex, cccc@myhost.test.ex
 extract item: bbbb@myhost.test.ex


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

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL localpart_data=cccc

 routed by bc router
   envelope to: cccc@myhost.test.ex
   transport: t1
 routed by bc router
   envelope to: cccc@myhost.test.ex
   transport: t1


@@ -112,7 +112,7 @@ bc router called for bbbb@myhost.test.ex
 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 localpart_data=bbbb

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


@@ -132,8 +132,8 @@ locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   => cccc <aaaa@myhost.test.ex> R=bc T=t1
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   => cccc <aaaa@myhost.test.ex> R=bc 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=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

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


@@ -168,6 +168,7 @@ After routing:
   Deferred addresses:
     defer@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile
   Deferred addresses:
     defer@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile

+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: queue_run MAIN
   End queue run: pid=pppp -qf
 LOG: queue_run MAIN
   End queue run: pid=pppp -qf

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