Testsuite: munge for list-search debug output of build-time options

[exim.git] / test / stderr / 0403

diff --git a/test/stderr/0403 b/test/stderr/0403
index f2edddcb6d642328e99a1e8657824c94f62d179c..e479b0c54d1b3fb19b04b72dff2c86e09e9f003a 100644 (file)
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -1,22 +1,6 @@
 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
 changed uid/gid: privilege not needed
@@ -65,10 +49,6 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1235
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -107,36 +87,38 @@ routing userx@test.ex
 --------> r1 router <--------
 local_part=userx domain=test.ex
 checking domains
-list element: lsearch;TESTSUITE/aux-fixed/0403.data
-search_open: lsearch "TESTSUITE/aux-fixed/0403.data"
-search_find: file="TESTSUITE/aux-fixed/0403.data"
-  key="test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
-LRU list:
-  0TESTSUITE/aux-fixed/0403.data
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0403.data"
-  type=lsearch key="test.ex" opts=NULL
-file lookup required for test.ex
-  in TESTSUITE/aux-fixed/0403.data
-creating new cache entry
-lookup yielded: [DOMAINDATA_test.ex]
-test.ex in "lsearch;TESTSUITE/aux-fixed/0403.data"? yes (matched "lsearch;TESTSUITE/aux-fixed/0403.data")
+test.ex in "lsearch;TESTSUITE/aux-fixed/0403.data"?
+ list element: lsearch;TESTSUITE/aux-fixed/0403.data
+ search_open: lsearch "TESTSUITE/aux-fixed/0403.data"
+ search_find: file="TESTSUITE/aux-fixed/0403.data"
+   key="test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0403.data
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0403.data"
+   type=lsearch key="test.ex" opts=NULL
+ file lookup required for test.ex
+   in TESTSUITE/aux-fixed/0403.data
+ creating new cache entry
+ lookup yielded: [DOMAINDATA_test.ex]
+ test.ex in "lsearch;TESTSUITE/aux-fixed/0403.data"? yes (matched "lsearch;TESTSUITE/aux-fixed/0403.data")
 checking local_parts
-list element: lsearch;TESTSUITE/aux-fixed/0403.data
-search_open: lsearch "TESTSUITE/aux-fixed/0403.data"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0403.data"
-  key="userx" partial=-1 affix=NULL starflags=0 opts=NULL
-LRU list:
-  0TESTSUITE/aux-fixed/0403.data
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0403.data"
-  type=lsearch key="userx" opts=NULL
-file lookup required for userx
-  in TESTSUITE/aux-fixed/0403.data
-creating new cache entry
-lookup yielded: [LOCALPARTDATA_userx]
-userx in "lsearch;TESTSUITE/aux-fixed/0403.data"? yes (matched "lsearch;TESTSUITE/aux-fixed/0403.data")
+userx in "lsearch;TESTSUITE/aux-fixed/0403.data"?
+ list element: lsearch;TESTSUITE/aux-fixed/0403.data
+ search_open: lsearch "TESTSUITE/aux-fixed/0403.data"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0403.data"
+   key="userx" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0403.data
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0403.data"
+   type=lsearch key="userx" opts=NULL
+ file lookup required for userx
+   in TESTSUITE/aux-fixed/0403.data
+ creating new cache entry
+ lookup yielded: [LOCALPARTDATA_userx]
+ userx in "lsearch;TESTSUITE/aux-fixed/0403.data"? yes (matched "lsearch;TESTSUITE/aux-fixed/0403.data")
 +++ROUTER:
 +++domain_data=[DOMAINDATA_test.ex]
 +++local_part_data=[LOCALPARTDATA_userx]