Skip to content

Commit ce3e20e

Browse files
committed
ts: extra spec search with same mod in several modpath in 51/040
1 parent e7f7767 commit ce3e20e

File tree

5 files changed

+74
-0
lines changed

5 files changed

+74
-0
lines changed

.hunspell.en.dic

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,3 +1137,4 @@ boolvar
11371137
foss21a
11381138
othervariant
11391139
bitwise
1140+
modpath

testsuite/modulefiles.3/foo/1.0

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,11 @@ if {[info exists env(TESTSUITE_OPTIONAL_OPT)]} {
2020
}
2121
}
2222
}
23+
24+
if {[info exists env(TESTSUITE_EXTRA)]} {
25+
switch -- $env(TESTSUITE_EXTRA) {
26+
dup11 - dup12 {
27+
setenv XTFOODUP value
28+
}
29+
}
30+
}

testsuite/modulefiles.4/foo/1.0

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
11
#%Module
2+
if {[info exists env(TESTSUITE_EXTRA)]} {
3+
switch -- $env(TESTSUITE_EXTRA) {
4+
dup10 - dup11 {
5+
setenv XTFOODUP value
6+
}
7+
}
8+
}

testsuite/modulefiles.4/xtfoo/1.0

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
11
#%Module
2+
if {[info exists env(TESTSUITE_EXTRA)]} {
3+
switch -- $env(TESTSUITE_EXTRA) {
4+
dup12 {
5+
setenv XTFOODUP value
6+
}
7+
}
8+
}

testsuite/modules.51-scan/040-extra_spec.exp

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,57 @@ testouterr_cmd sh {list extra/1.0 variant:xtfoo} ERR $tserr
203203
unsetenv_loaded_module
204204

205205

206+
#
207+
# multiple modulepaths
208+
#
209+
210+
setenv_var MODULES_AVAIL_TERSE_OUTPUT dir
211+
setenv_var MODULES_SEARCH_MATCH starts_with
212+
213+
setenv_var TESTSUITE_EXTRA dup10
214+
215+
setenv_path_var MODULEPATH $modpath.3:$mp
216+
set tserr "$mp:\nfoo/1.0"
217+
testouterr_cmd sh {avail -t setenv:XTFOODUP} OK $tserr
218+
testouterr_cmd sh {avail -t foo setenv:XTFOODUP} OK $tserr
219+
220+
setenv_path_var MODULEPATH $mp:$modpath.3
221+
testouterr_cmd sh {avail -t setenv:XTFOODUP} OK $tserr
222+
testouterr_cmd sh {avail -t foo setenv:XTFOODUP} OK $tserr
223+
224+
225+
setenv_var TESTSUITE_EXTRA dup11
226+
227+
setenv_path_var MODULEPATH $modpath.3:$mp
228+
set tserr "$modpath.3:\nfoo/1.0\n\n$mp:\nfoo/1.0"
229+
testouterr_cmd sh {avail -t setenv:XTFOODUP} OK $tserr
230+
testouterr_cmd sh {avail -t foo setenv:XTFOODUP} OK $tserr
231+
232+
setenv_path_var MODULEPATH $mp:$modpath.3
233+
set tserr "$mp:\nfoo/1.0\n\n$modpath.3:\nfoo/1.0"
234+
testouterr_cmd sh {avail -t setenv:XTFOODUP} OK $tserr
235+
testouterr_cmd sh {avail -t foo setenv:XTFOODUP} OK $tserr
236+
237+
238+
setenv_var TESTSUITE_EXTRA dup12
239+
240+
setenv_path_var MODULEPATH $modpath.3:$mp
241+
set tserr "$modpath.3:\nfoo/1.0\n\n$mp:\nxtfoo/1.0"
242+
testouterr_cmd sh {avail -t setenv:XTFOODUP} OK $tserr
243+
244+
set tserr "$modpath.3:\nfoo/1.0"
245+
testouterr_cmd sh {avail -t foo setenv:XTFOODUP} OK $tserr
246+
247+
setenv_path_var MODULEPATH $mp:$modpath.3
248+
set tserr "$mp:\nxtfoo/1.0\n\n$modpath.3:\nfoo/1.0"
249+
testouterr_cmd sh {avail -t setenv:XTFOODUP} OK $tserr
250+
251+
set tserr "$modpath.3:\nfoo/1.0"
252+
testouterr_cmd sh {avail -t foo setenv:XTFOODUP} OK $tserr
253+
254+
unsetenv_var MODULES_SEARCH_MATCH
255+
256+
206257
#
207258
# Cleanup
208259
#

0 commit comments

Comments
 (0)