Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0437

diff --git a/test/stderr/0437 b/test/stderr/0437
index 6bbf6b7f0af8db40b5615ed6337b01adc21f8a51..debc4f72a2323a315181c7630be8c09fa6161765 100644 (file)
--- a/test/stderr/0437
+++ b/test/stderr/0437
@@ -1,44 +1,48 @@
 Exim version x.yz ....
+Hints DB:
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"
-   key="spool" partial=-1 affix=NULL starflags=0
+   key="spool" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0437.ls
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"
-   type=lsearch key="spool"
+   type=lsearch key="spool" opts=NULL
  file lookup required for spool
    in TESTSUITE/aux-fixed/0437.ls
+ creating new cache entry
  lookup yielded: spool
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
-  Start queue run: pid=pppp
+  Start queue run: pid=p1234
 search_tidyup called
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"
-   key="transport" partial=-1 affix=NULL starflags=0
+   key="transport" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0437.ls
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"
-   type=lsearch key="transport"
+   type=lsearch key="transport" opts=NULL
  file lookup required for transport
    in TESTSUITE/aux-fixed/0437.ls
+ creating new cache entry
  lookup yielded: t1
 search_tidyup called
 search_tidyup called
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"
-   key="file" partial=-1 affix=NULL starflags=0
+   key="file" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0437.ls
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"
-   type=lsearch key="file"
+   type=lsearch key="file" opts=NULL
  file lookup required for file
    in TESTSUITE/aux-fixed/0437.ls
+ creating new cache entry
  lookup yielded: file
 search_tidyup called
 LOG: MAIN
@@ -46,30 +50,33 @@ LOG: MAIN
 LOG: MAIN
   Completed
 search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1235 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 search_tidyup called
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"
-   key="transport" partial=-1 affix=NULL starflags=0
+   key="transport" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0437.ls
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"
-   type=lsearch key="transport"
+   type=lsearch key="transport" opts=NULL
  file lookup required for transport
    in TESTSUITE/aux-fixed/0437.ls
+ creating new cache entry
  lookup yielded: t1
 search_tidyup called
 search_tidyup called
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"
-   key="file" partial=-1 affix=NULL starflags=0
+   key="file" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0437.ls
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"
-   type=lsearch key="file"
+   type=lsearch key="file" opts=NULL
  file lookup required for file
    in TESTSUITE/aux-fixed/0437.ls
+ creating new cache entry
  lookup yielded: file
 search_tidyup called
 LOG: MAIN
@@ -77,7 +84,8 @@ LOG: MAIN
 LOG: MAIN
   Completed
 search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1236 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
-  End queue run: pid=pppp
+  End queue run: pid=p1234
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>