envmodules/modules
1
0
Fork 0
mirror of https://github.com/envmodules/modules.git synced 2026-05-30 00:12:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ts: test misplaced/invalid prereq option in 50/550

Browse Source
This commit is contained in:
Xavier Delaruelle
2022-05-29 20:16:43 +02:00
parent f2b1de37fc
commit 2984dcee2e
4 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
testsuite/modulefiles.3/optional/1.0
View File

@@ -76,5 +76,8 @@ if {[info exists env(TESTSUITE_OPTIONAL_OPT)]} {
err1 {
prereq foo/1.0 --optional
}
err2 {
prereq --foo --optional foo/1.0
}
}
}

20
testsuite/modules.50-cmds/465-tag-opt.exp
View File

@@ -1187,24 +1187,12 @@ unsetenv_path_var __MODULES_LMTAG
setenv_var TESTSUITE_TAG_OPT prtagbad1
setenv_var MODULES_ADVANCED_VERSION_SPEC 1
setenv_var MODULES_IMPLICIT_DEFAULT 1
set ans [list]
lappend ans [list set __MODULES_LMALTNAME foo/2.0&as|foo/default&as|foo/latest]
lappend ans [list set __MODULES_LMPREREQ $mod&foo/1.0\ --tag|foo]
lappend ans [list set _LMFILES_ $mp/foo/2.0:$modfile]
lappend ans [list set LOADEDMODULES foo/2.0:$mod]
lappend ans [list set __MODULES_LMTAG foo/2.0&auto-loaded]
lappend ans [list ERR]
set tserr [msg_top_load $mod {} foo/2.0 {}]
testouterr_cmd sh "load --auto $mod" $ans $tserr
set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 68}]
set tserr [escre [msg_load $mod [msg_moderr {Misplaced option '--tag'} {prereq foo/1.0 --tag foo<EXM>} $modfile $ln]]]
testouterr_cmd_re sh "load --auto $mod" ERR $tserr
setenv_var MODULES_ADVANCED_VERSION_SPEC 0
set ans [list]
lappend ans [list set __MODULES_LMPREREQ $mod&foo/1.0|--tag|foo]
lappend ans [list set _LMFILES_ $mp/foo/1.0:$modfile]
lappend ans [list set LOADEDMODULES foo/1.0:$mod]
lappend ans [list set __MODULES_LMTAG foo/1.0&auto-loaded]
set tserr [msg_top_load $mod {} foo/1.0 {}]
testouterr_cmd sh "load --auto $mod" $ans $tserr
testouterr_cmd_re sh "load --auto $mod" ERR $tserr
unsetenv_var MODULES_IMPLICIT_DEFAULT
unsetenv_var MODULES_ADVANCED_VERSION_SPEC

15
testsuite/modules.50-cmds/550-optional-opt.exp
View File

@@ -432,14 +432,15 @@ testouterr_cmd sh "load --no-auto $mod" $ans $tserr
# wrongly positioned --optional argument
setenv_var TESTSUITE_OPTIONAL_OPT err1
set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 2 : 77}]
set tserr [escre [msg_load $mod [msg_moderr {Misplaced option '--optional'} {prereq foo/1.0 --optional<EXM>} $modfile $ln]]]
testouterr_cmd_re sh "load --auto $mod" ERR $tserr
set ans [list]
lappend ans [list set __MODULES_LMPREREQ $mod&$mod|unk/1.0|foo/1.0]
lappend ans [list set _LMFILES_ $modfile]
lappend ans [list set LOADEDMODULES $mod]
lappend ans [list ERR]
set tserr [msg_load foo/1.0{--optional} [err_unkvar -optional]]\n\n[msg_load $mod [err_reqlo foo/1.0{--optional}]]
testouterr_cmd sh "load --auto $mod" ERR $tserr
# invalid option
setenv_var TESTSUITE_OPTIONAL_OPT err2
set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 2 : 80}]
set tserr [escre [msg_load $mod [msg_moderr {Invalid option '--foo'} {prereq --foo --optional foo/1.0<EXM>} $modfile $ln]]]
testouterr_cmd_re sh "load --auto $mod" ERR $tserr
# no requirement loaded, then load first one

5
testsuite/modules.70-maint/240-icase.exp
View File

@@ -308,8 +308,9 @@ lappend ans [list set _LMFILES_ $mp/icase/unload]
lappend ans [list set LOADEDMODULES icase/unload]
testouterr_cmd_re sh {load --icase icase/unload} $ans {}
testouterr_cmd_re sh {load --icase --auto icase/loadi} ERR [msg_load icase/loadi $err_path'--icase' [err_reqlo --icase]]
testouterr_cmd_re sh {load --auto icase/loadi} ERR [msg_load icase/loadi $err_path'--icase' [err_reqlo --icase]]
set tserr [msg_load icase/loadi [msg_moderr {Invalid option '--icase'} {module load --icase noCASE/1} $mp/icase/loadi 2]]
testouterr_cmd sh {load --icase --auto icase/loadi} ERR $tserr
testouterr_cmd sh {load --auto icase/loadi} ERR $tserr
set ans [list]
lappend ans [list set _LMFILES_ $mp/icase/isloaded]