Debug: list searching

1 files changed, 103 insertions, 61 deletions

diff --git a/test/stderr/0414 b/test/stderr/0414
index 7ab5307dd..5183f09ed 100644
--- a/test/stderr/0414
+++ b/test/stderr/0414
@@ -1,6 +1,22 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
+list element: PATH
+list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+list element: PATH
+list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+list element: PATH
+list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+list element: PATH
+list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+list element: PATH
+list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+list element: PATH
+list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+list element: PATH
+list element: PATH
+list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -18,41 +34,54 @@ routing x@b.domain
 --------> r1 router <--------
 local_part=x domain=b.domain
 checking domains
-search_open: lsearch "TESTSUITE/aux-fixed/0414.list1"
-search_find: file="TESTSUITE/aux-fixed/0414.list1"
-  key="b.domain" partial=-1 affix=NULL starflags=0 opts=NULL
-LRU list:
-  0TESTSUITE/aux-fixed/0414.list1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0414.list1"
-  type=lsearch key="b.domain" opts=NULL
-file lookup required for b.domain
-  in TESTSUITE/aux-fixed/0414.list1
-creating new cache entry
-lookup failed
-b.domain in "lsearch;TESTSUITE/aux-fixed/0414.list1"? no (end of list)
-search_open: lsearch "TESTSUITE/aux-fixed/0414.list2"
-search_find: file="TESTSUITE/aux-fixed/0414.list2"
-  key="b.domain" partial=-1 affix=NULL starflags=0 opts=NULL
-LRU list:
-  0TESTSUITE/aux-fixed/0414.list2
-  0TESTSUITE/aux-fixed/0414.list1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0414.list2"
-  type=lsearch key="b.domain" opts=NULL
-file lookup required for b.domain
-  in TESTSUITE/aux-fixed/0414.list2
-creating new cache entry
-lookup yielded: b.domain-data
-b.domain in "lsearch;TESTSUITE/aux-fixed/0414.list2"? yes (matched "lsearch;TESTSUITE/aux-fixed/0414.list2")
-data from lookup saved for cache for +B: key 'b.domain' value 'b.domain-data'
-b.domain in "+A : +B"? yes (matched "+B")
+list element: !+C
+ start sublist C
+  list element: +A
+   start sublist A
+   ╎list element: lsearch;TESTSUITE/aux-fixed/0414.list1
+   ╎search_open: lsearch "TESTSUITE/aux-fixed/0414.list1"
+   ╎search_find: file="TESTSUITE/aux-fixed/0414.list1"
+   ╎  key="b.domain" partial=-1 affix=NULL starflags=0 opts=NULL
+   ╎LRU list:
+   ╎  ;TESTSUITE/aux-fixed/0414.list1
+   ╎  End
+   ╎internal_search_find: file="TESTSUITE/aux-fixed/0414.list1"
+   ╎  type=lsearch key="b.domain" opts=NULL
+   ╎file lookup required for b.domain
+   ╎  in TESTSUITE/aux-fixed/0414.list1
+   ╎creating new cache entry
+   ╎lookup failed
+   ╎b.domain in "lsearch;TESTSUITE/aux-fixed/0414.list1"? no (end of list)
+   end sublist A
+  list element: +B
+   start sublist B
+   ╎list element: lsearch;TESTSUITE/aux-fixed/0414.list2
+   ╎search_open: lsearch "TESTSUITE/aux-fixed/0414.list2"
+   ╎search_find: file="TESTSUITE/aux-fixed/0414.list2"
+   ╎  key="b.domain" partial=-1 affix=NULL starflags=0 opts=NULL
+   ╎LRU list:
+   ╎  ;TESTSUITE/aux-fixed/0414.list2
+   ╎  ;TESTSUITE/aux-fixed/0414.list1
+   ╎  End
+   ╎internal_search_find: file="TESTSUITE/aux-fixed/0414.list2"
+   ╎  type=lsearch key="b.domain" opts=NULL
+   ╎file lookup required for b.domain
+   ╎  in TESTSUITE/aux-fixed/0414.list2
+   ╎creating new cache entry
+   ╎lookup yielded: b.domain-data
+   ╎b.domain in "lsearch;TESTSUITE/aux-fixed/0414.list2"? yes (matched "lsearch;TESTSUITE/aux-fixed/0414.list2")
+   end sublist B
+  data from lookup saved for cache for +B: key 'b.domain' value 'b.domain-data'
+  b.domain in "+A : +B"? yes (matched "+B")
+ end sublist C
 data from lookup saved for cache for +C: key 'b.domain' value 'b.domain-data'
 b.domain in "!+C"? no (matched "!+C")
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=x domain=b.domain
 checking domains
+list element: +B
+ start sublist B
 cached yes match for +B
 cached lookup data = b.domain-data
 b.domain in "+B"? yes (matched "+B" - cached)
@@ -77,49 +106,62 @@ routing x@a.domain
 --------> r1 router <--------
 local_part=x domain=a.domain
 checking domains
-search_open: lsearch "TESTSUITE/aux-fixed/0414.list1"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0414.list1"
-  key="a.domain" partial=-1 affix=NULL starflags=0 opts=NULL
-LRU list:
-  0TESTSUITE/aux-fixed/0414.list1
-  0TESTSUITE/aux-fixed/0414.list2
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0414.list1"
-  type=lsearch key="a.domain" opts=NULL
-file lookup required for a.domain
-  in TESTSUITE/aux-fixed/0414.list1
-creating new cache entry
-lookup yielded: a.domain-data
-a.domain in "lsearch;TESTSUITE/aux-fixed/0414.list1"? yes (matched "lsearch;TESTSUITE/aux-fixed/0414.list1")
-data from lookup saved for cache for +A: key 'a.domain' value 'a.domain-data'
-a.domain in "+A : +B"? yes (matched "+A")
+list element: !+C
+ start sublist C
+  list element: +A
+   start sublist A
+   ╎list element: lsearch;TESTSUITE/aux-fixed/0414.list1
+   ╎search_open: lsearch "TESTSUITE/aux-fixed/0414.list1"
+   ╎  cached open
+   ╎search_find: file="TESTSUITE/aux-fixed/0414.list1"
+   ╎  key="a.domain" partial=-1 affix=NULL starflags=0 opts=NULL
+   ╎LRU list:
+   ╎  ;TESTSUITE/aux-fixed/0414.list1
+   ╎  ;TESTSUITE/aux-fixed/0414.list2
+   ╎  End
+   ╎internal_search_find: file="TESTSUITE/aux-fixed/0414.list1"
+   ╎  type=lsearch key="a.domain" opts=NULL
+   ╎file lookup required for a.domain
+   ╎  in TESTSUITE/aux-fixed/0414.list1
+   ╎creating new cache entry
+   ╎lookup yielded: a.domain-data
+   ╎a.domain in "lsearch;TESTSUITE/aux-fixed/0414.list1"? yes (matched "lsearch;TESTSUITE/aux-fixed/0414.list1")
+   end sublist A
+  data from lookup saved for cache for +A: key 'a.domain' value 'a.domain-data'
+  a.domain in "+A : +B"? yes (matched "+A")
+ end sublist C
 data from lookup saved for cache for +C: key 'a.domain' value 'a.domain-data'
 a.domain in "!+C"? no (matched "!+C")
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=x domain=a.domain
 checking domains
-search_open: lsearch "TESTSUITE/aux-fixed/0414.list2"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0414.list2"
-  key="a.domain" partial=-1 affix=NULL starflags=0 opts=NULL
-LRU list:
-  0TESTSUITE/aux-fixed/0414.list2
-  0TESTSUITE/aux-fixed/0414.list1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0414.list2"
-  type=lsearch key="a.domain" opts=NULL
-file lookup required for a.domain
-  in TESTSUITE/aux-fixed/0414.list2
-creating new cache entry
-lookup failed
-a.domain in "lsearch;TESTSUITE/aux-fixed/0414.list2"? no (end of list)
+list element: +B
+ start sublist B
+  list element: lsearch;TESTSUITE/aux-fixed/0414.list2
+  search_open: lsearch "TESTSUITE/aux-fixed/0414.list2"
+    cached open
+  search_find: file="TESTSUITE/aux-fixed/0414.list2"
+    key="a.domain" partial=-1 affix=NULL starflags=0 opts=NULL
+  LRU list:
+    0TESTSUITE/aux-fixed/0414.list2
+    0TESTSUITE/aux-fixed/0414.list1
+    End
+  internal_search_find: file="TESTSUITE/aux-fixed/0414.list2"
+    type=lsearch key="a.domain" opts=NULL
+  file lookup required for a.domain
+    in TESTSUITE/aux-fixed/0414.list2
+  creating new cache entry
+  lookup failed
+  a.domain in "lsearch;TESTSUITE/aux-fixed/0414.list2"? no (end of list)
+ end sublist B
 a.domain in "+B"? no (end of list)
 r2 router skipped: domains mismatch
 --------> r3 router <--------
 local_part=x domain=a.domain
 checking domains
+list element: +A
+ start sublist A
 cached yes match for +A
 cached lookup data = a.domain-data
 a.domain in "+A"? yes (matched "+A" - cached)