X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/129a5d133927ff8fa4b3f941f83c022d2daf18f3..4468bfff7dc28b9c54a5225d3f10a6aa6a67a1d9:/test/scripts/2500-dsearch/2500

diff --git a/test/scripts/2500-dsearch/2500 b/test/scripts/2500-dsearch/2500
index 040ce599e..f3937ec91 100644
--- a/test/scripts/2500-dsearch/2500
+++ b/test/scripts/2500-dsearch/2500
@@ -1,12 +1,33 @@
 # dsearch lookup
 # This test will fail on a case-insensitive filesystem (e.g. MacOS default)
 exim -be
+dsearch specifics
 ok:         ${lookup{TESTNUM.tst}		dsearch{DIR/aux-fixed}{$value}{FAIL}}
 fail:       ${lookup{TESTNUM.file_not_here}	dsearch{DIR/aux-fixed}{$value}{FAIL}}
 fail:       ${lookup{TESTNUM.tst}		dsearch{DIR/dir_not_here}{$value}{FAIL}}
 fail(case): ${lookup{TESTNUM.TST}		dsearch{DIR/aux-fixed}{$value}{FAIL}}
 fail(case): ${lookup{TESTNUM.TST}		dsearch{DIR/AUX-fixed}{$value}{FAIL}}
 fail(path): ${lookup{TESTNUM.tst}		dsearch{.}{$value}{OTHER}}
+ok,full:    ${lookup{TESTNUM.tst} dsearch,ret=full      {DIR/aux-fixed}{$value}{FAIL}}
+ok,key:     ${lookup{TESTNUM.tst} dsearch,ret=key       {DIR/aux-fixed}{$value}{FAIL}}
+ok,file:    ${lookup{TESTNUM.tst} dsearch,filter=file   {DIR/aux-fixed}{$value}{FAIL}}
+fail,file:  ${lookup{TESTNUM.dir} dsearch,filter=file   {DIR/aux-fixed}{$value}{FAIL}}
+ok,dir:     ${lookup{TESTNUM.dir} dsearch,filter=dir    {DIR/aux-fixed}{$value}{FAIL}}
+fail,dir:   ${lookup{TESTNUM.tst} dsearch,filter=dir    {DIR/aux-fixed}{$value}{FAIL}}
+ok,subdir:  ${lookup{TESTNUM.dir} dsearch,filter=subdir {DIR/aux-fixed}{$value}{FAIL}}
+fail,subdir(..):${lookup{..}          dsearch,filter=subdir {DIR/aux-fixed}{$value}{FAIL}}
+fail,subdir(.) :${lookup{.}           dsearch,filter=subdir {DIR/aux-fixed}{$value}{FAIL}}
+fail,subdir(f) :${lookup{TESTNUM.tst} dsearch,filter=subdir {DIR/aux-fixed}{$value}{FAIL}}
+
+cachelayer tests
+fail:       ${lookup{test-data}   dsearch               {DIR/}          {$value}{FAIL}}
+createfile: ${run {/bin/cp DIR/aux-fixed/TESTNUM.tst DIR/test-data} {OK}{FAIL}}
+fail,cached:${lookup{test-data}   dsearch               {DIR/}         {$value}{FAIL}}
+ok,no_rd    ${lookup{test-data}   dsearch,cache=no_rd   {DIR/}         {$value}{FAIL}}
+delfile:    ${run {/bin/rm DIR/test-data}                            {OK}{FAIL}}
+ok,cached:  ${lookup{test-data}   dsearch               {DIR/}         {$value}{FAIL}}
+fail,no_rd  ${lookup{test-data}   dsearch,cache=no_rd   {DIR/}         {$value}{FAIL}}
+fail:       ${lookup{test-data}   dsearch               {DIR/}         {$value}{FAIL}}
 ****
 #
 1