ts: fix contains search-match tests in {90,92}/080

Signed-off-by: Xavier Delaruelle <[email protected]>

Author: xdelaruelle

testsuite/modules.00-init/005-init_ts.exp

@@ -904,6 +904,10 @@ proc if_availindepth {then {else {}}} {
     return [expr {$::install_availindepth eq {y} ? $then : $else}]
 }
 
+proc if_searchcontains {then {else {}}} {
+    return [expr {$::install_searchmatch eq {contains} ? $then : $else}]
+}
+
 proc if_configlocked {option then {else {}}} {
     return [expr {[is_config_locked $option] ? $then : $else}]
 }

testsuite/modules.90-avail/080-noindepth.exp

@@ -180,9 +180,9 @@ testouterr_cmd sh {avail -t -d mod1*/*} OK [if_implicitdefault "$mp:\nmod1/2\nmo
 testouterr_cmd sh {avail -t -L mod1*/*} OK "$mp:\nmod1/2\nmod11/2"
 testouterr_cmd sh {avail -t -d mod1?/} OK [if_implicitdefault "$mp:\nmod11/2"]
 testouterr_cmd sh {avail -t -L mod1?/} OK "$mp:\nmod11/2"
-#FIXME: issue to fix when --with-search-match=contains
-testouterr_cmd sh {avail -t -d mod2?} OK {} xfail
-testouterr_cmd sh {avail -t -L mod2?} OK {} xfail
+# contains search-match matches "/" character
+testouterr_cmd sh {avail -t -d mod2?} OK [if_searchcontains "$mp:\nmod2/" {}]
+testouterr_cmd sh {avail -t -L mod2?} OK [if_searchcontains "$mp:\nmod2/" {}]
 testouterr_cmd sh {avail -t -d mod2?/} OK {}
 testouterr_cmd sh {avail -t -L mod2?/} OK {}
 testouterr_cmd sh {avail -t */*/} OK "$mp:\ndeepA/4/1/(ds)\nmod6/3/1/\nmod7/4/1\nmod8/4/1(@)\nmod9/3/2(default)\nmod9/4/1"

testsuite/modules.92-spider/080-spider-noindepth.exp

@@ -181,8 +181,8 @@ testouterr_cmd sh {spider -t -L mod1*/*} OK "$mp:\nmod1/2\nmod11/2"
 testouterr_cmd sh {spider -t -d mod1?/} OK [if_implicitdefault "$mp:\nmod11/2"]
 testouterr_cmd sh {spider -t -L mod1?/} OK "$mp:\nmod11/2"
 #FIXME: issue to fix when --with-search-match=contains
-testouterr_cmd sh {spider -t -d mod2?} OK {} xfail
-testouterr_cmd sh {spider -t -L mod2?} OK {} xfail
+testouterr_cmd sh {spider -t -d mod2?} OK [if_searchcontains "$mp:\nmod2/" {}]
+testouterr_cmd sh {spider -t -L mod2?} OK [if_searchcontains "$mp:\nmod2/" {}]
 testouterr_cmd sh {spider -t -d mod2?/} OK {}
 testouterr_cmd sh {spider -t -L mod2?/} OK {}
 testouterr_cmd sh {spider -t */*/} OK "$mp:\ndeepA/4/1/(ds)\nmod6/3/1/\nmod7/4/1\nmod8/4/1(@)\nmod9/3/2(default)\nmod9/4/1"