envmodules/modules
1
0
Fork 0
mirror of https://github.com/envmodules/modules.git synced 2026-06-03 00:33:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ts: additionnal adv_vers_spec in 70/272 and install ts

Browse Source
This commit is contained in:
Xavier Delaruelle
2019-11-12 06:14:11 +01:00
parent da49026fdb
commit b22d34f485
6 changed files with 80 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
testsuite/install.00-init/005-init_ts.exp
View File

@@ -272,4 +272,8 @@ proc is_set_shell_startup_enabled {} {
}
}
proc is_config_locked {option} {
return [expr {[lsearch -exact $::install_lockedconfigs $option] != -1}]
}
# vim:set tabstop=3 shiftwidth=3 expandtab autoindent:

15
testsuite/install.00-init/020-module.exp
View File

@@ -95,6 +95,20 @@ foreach shell $othlang_list {
testall_cmd "$shell" "use,$contrib_modpath:unload,null:list,-t" "" "$no_loaded" 0
}
# ensure advanced_version_spec is efficient on all shells
set loadunloadout "Loading advvers6/1.3\n Loading requirement: advvers7/1.0\nUnloading advvers7/1.0\n Unloading dependent: advvers6/1.3"
if {![is_config_locked implicit_default]} {
foreach shell $shell_list {
testall_cmd $shell "module use $testsuite_modpath.2\; module config implicit_default 1\; module config verbosity normal\; module config advanced_version_spec 1\; module load --auto advvers6@1.3\; module unload --auto advvers7@1.0" {} $loadunloadout 0
}
foreach shell $othlang_list {
testall_cmd $shell "use,$testsuite_modpath.2:config,implicit_default,1:config,verbosity,normal:config,advanced_version_spec,1:load,--auto,advvers6@1.3:unload,--auto,advvers7@1.0" {} $loadunloadout 0
}
} elseif {$verbose > 0} {
send_user "\tSkipping advanced_version_spec tests as implicit_default config is locked\n"
}
#
# Clean up variables used in this test case
#
@@ -104,5 +118,6 @@ unset env(_LMFILES_)
unset bad_cmd
unset anstxt
unset loadunloadout
# vim:set tabstop=3 shiftwidth=3 expandtab autoindent:

2
testsuite/modulefiles.2/advvers6/3.0 Normal file
View File

@@ -0,0 +1,2 @@
#%Module
prereq extdfl2@3:3.9

2
testsuite/modulefiles.2/advvers6/3.1 Normal file
View File

@@ -0,0 +1,2 @@
#%Module
prereq extdfl7@:10

2
testsuite/modulefiles.2/advvers6/3.2 Normal file
View File

@@ -0,0 +1,2 @@
#%Module
prereq extdfl7@:11

55
testsuite/modules.70-maint/272-adv_version_spec-range.exp
View File

@@ -234,6 +234,12 @@ testouterr_cmd sh {avail -t advvers@2.1:} OK {}
testouterr_cmd sh {whatis advvers@:2.2} ERR "$err_path'advvers@:2.2'"
setenv_var MODULES_ADVANCED_VERSION_SPEC 1
# test @major:major.minor
testouterr_cmd sh {avail -t extdfl2 @3:3.1} OK "$mp:\nextdfl2/3.0.0\nextdfl2/3.0.2\nextdfl2/3.0.15\nextdfl2/3.1.3\nextdfl2/3.1.7"
# test major version number mixing alpha and numerical characters
testouterr_cmd sh {avail -t extdfl7@9:10} OK "$mp:\nextdfl7/9.1"
testouterr_cmd sh {avail -t extdfl7@9:11} OK "$mp:\nextdfl7/9.1\nextdfl7/10a"
#
# check consistent effect over the one module selection context
@@ -514,6 +520,13 @@ lappend ans [list setpath LOADEDMODULES advvers7/0.9:advvers6/1.3]
lappend ans [list setpath _LMFILES_ $mp/advvers7/0.9:$mp/advvers6/1.3]
lappend ans [list setpath MODULES_LMPREREQ advvers6/1.3&advvers7@<1.0]
testouterr_cmd_re sh {load --auto advvers7@0.9} $ans [msg_top_load advvers7/0.9 {} {} advvers6/1.3]
# with adv_version_spec disabled
setenv_var MODULES_ADVANCED_VERSION_SPEC 0
set ans [list]
lappend ans [list setpath LOADEDMODULES advvers6/1.3:advvers7/1.0]
lappend ans [list setpath _LMFILES_ $mp/advvers6/1.3:$mp/advvers7/1.0]
testouterr_cmd_re sh {load --auto advvers7/1.0} $ans {}
setenv_var MODULES_ADVANCED_VERSION_SPEC 1
unsetenv_loaded_module
unsetenv_path_var MODULES_LMPREREQ
@@ -536,6 +549,15 @@ testouterr_cmd_re sh {unload --auto advvers7@1.0} $ans [msg_top_unload advvers7/
# unload prereq in no-auto mode
testouterr_cmd_re sh {unload --no-auto advvers7@1.0} ERR [msg_unload advvers7/1.0 [err_prerequn advvers7/1.0 advvers6/1.3]]
# with adv_version_spec disabled
setenv_var MODULES_ADVANCED_VERSION_SPEC 0
set ans [list]
lappend ans [list setpath LOADEDMODULES advvers7/1.0]
lappend ans [list setpath _LMFILES_ $mp/advvers7/1.0]
lappend ans [list unsetpath MODULES_LMPREREQ]
testouterr_cmd sh {unload --auto advvers6/1.3} $ans {}
setenv_var MODULES_ADVANCED_VERSION_SPEC 1
# force prereq unload
set ans [list]
lappend ans [list setpath LOADEDMODULES advvers6/1.3]
@@ -584,6 +606,28 @@ lappend ans [list setpath MODULES_LMNOTUASKED advvers6/1.6]
lappend ans [list ERR]
testouterr_cmd_re sh {load --auto advvers7@1.3.2} $ans [msg_top_load advvers7/1.3.2 {} advvers6/1.6 {}]
# requirement expressed with @major:major.minor (check if >major.minor versions are avoided)
set ans [list]
lappend ans [list setpath LOADEDMODULES extdfl2/3.9.2:advvers6/3.0]
lappend ans [list setpath _LMFILES_ $mp/extdfl2/3.9.2:$mp/advvers6/3.0]
lappend ans [list setpath MODULES_LMPREREQ "advvers6/3.0&extdfl2@3<3.9"]
lappend ans [list setpath MODULES_LMNOTUASKED extdfl2/3.9.2]
testouterr_cmd_re sh {load --auto advvers6@3.0} $ans [msg_top_load advvers6/3.0 {} extdfl2/3.9.2 {}]
# test major version number mixing alpha and numerical characters
set ans [list]
lappend ans [list setpath LOADEDMODULES extdfl7/9.1:advvers6/3.1]
lappend ans [list setpath _LMFILES_ $mp/extdfl7/7.0:$mp/advvers6/3.1]
lappend ans [list setpath MODULES_LMPREREQ "advvers6/3.1&extdfl7@<10"]
lappend ans [list setpath MODULES_LMNOTUASKED extdfl7/9.1]
testouterr_cmd_re sh {load --auto advvers6@3.1} $ans [msg_top_load advvers6/3.1 {} extdfl7/9.1 {}]
set ans [list]
lappend ans [list setpath LOADEDMODULES extdfl7/10a:advvers6/3.2]
lappend ans [list setpath _LMFILES_ $mp/extdfl7/10a:$mp/advvers6/3.2]
lappend ans [list setpath MODULES_LMPREREQ "advvers6/3.2&extdfl7@<11"]
lappend ans [list setpath MODULES_LMNOTUASKED extdfl7/10a]
testouterr_cmd_re sh {load --auto advvers6@3.2} $ans [msg_top_load advvers6/3.2 {} extdfl7/10a {}]
# conflict not loaded
set ans [list]
@@ -603,6 +647,17 @@ testouterr_cmd sh {load advvers7@3.0} ERR [msg_load advvers7/3.0 [err_conflict a
setenv_loaded_module [list advvers6/1.2] [list $mp/advvers6/1.2]
testouterr_cmd sh {load advvers7@3.0} ERR [msg_load advvers7/3.0 [err_conflict advvers7/3.0 advvers6 @1.0:1.6]]
# conflict loaded with advanced_version_spec disabled
setenv_loaded_module [list advvers7/3.0] [list $mp/advvers7/3.0]
setenv_path_var MODULES_LMCONFLICT "advvers7/3.0&advvers6 @1.1<1.6"
setenv_var MODULES_ADVANCED_VERSION_SPEC 0
set ans [list]
lappend ans [list setpath LOADEDMODULES advvers7/3.0:advvers6/1.6]
lappend ans [list setpath _LMFILES_ $mp/advvers7/3.0:$mp/advvers6/1.6]
testouterr_cmd_re sh {load advvers6/1.6} $ans {}
setenv_var MODULES_ADVANCED_VERSION_SPEC 1
unsetenv_path_var MODULES_LMCONFLICT
# conflict loaded but conflicting module load forced
setenv_loaded_module [list advvers6/1.6] [list $mp/advvers6/1.6]
set ans [list]