"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "testsuite/modules.50-cmds/465-tag-opt.exp" between
modules-5.1.1.tar.bz2 and modules-5.2.0.tar.bz2

About: The Environment Modules package provides for the dynamic modification of a user’s environment via modulefiles.

465-tag-opt.exp  (modules-5.1.1.tar.bz2):465-tag-opt.exp  (modules-5.2.0.tar.bz2)
skipping to change at line 346 skipping to change at line 346
unsetenv_loaded_module unsetenv_loaded_module
unsetenv_path_var __MODULES_LMPREREQ unsetenv_path_var __MODULES_LMPREREQ
unsetenv_path_var __MODULES_LMEXTRATAG unsetenv_path_var __MODULES_LMEXTRATAG
unsetenv_path_var __MODULES_LMTAG unsetenv_path_var __MODULES_LMTAG
setenv_var MODULES_ADVANCED_VERSION_SPEC 1 setenv_var MODULES_ADVANCED_VERSION_SPEC 1
setenv_var TESTSUITE_TAG_OPT loadtag4 setenv_var TESTSUITE_TAG_OPT loadtag4
set ans [list] set ans [list]
lappend ans [list set __MODULES_LMVARIANT variant/3.0&bar|val1|0|0] lappend ans [list set __MODULES_LMVARIANT variant/3.0&bar|val1|0|0]
lappend ans [list set __MODULES_LMPREREQ $mod&variant@3.0\ bar=val1] lappend ans [list set __MODULES_LMPREREQ $mod&$mod|variant@3.0\ bar=val1]
lappend ans [list set _LMFILES_ $mp/variant/3.0:$modfile] lappend ans [list set _LMFILES_ $mp/variant/3.0:$modfile]
lappend ans [list set LOADEDMODULES variant/3.0:$mod] lappend ans [list set LOADEDMODULES variant/3.0:$mod]
lappend ans [list set __MODULES_LMEXTRATAG variant/3.0&foo:$mod&bar] lappend ans [list set __MODULES_LMEXTRATAG variant/3.0&foo:$mod&bar]
lappend ans [list set __MODULES_LMTAG variant/3.0&foo&auto-loaded:$mod&bar] lappend ans [list set __MODULES_LMTAG variant/3.0&foo&auto-loaded:$mod&bar]
set tserr [msg_top_load "$mod <bar>" {} {variant/3.0{bar=val1}} {}] set tserr [msg_top_load "$mod <bar>" {} {variant/3.0{bar=val1}} {}]
testouterr_cmd sh "load --tag=bar $mod" $ans $tserr testouterr_cmd sh "load --tag=bar $mod" $ans $tserr
setenv_loaded_module [list variant/3.0 $mod] [list $mp/variant/3.0 $modfile] setenv_loaded_module [list variant/3.0 $mod] [list $mp/variant/3.0 $modfile]
setenv_path_var __MODULES_LMVARIANT variant/3.0&bar|val1|0|0 setenv_path_var __MODULES_LMVARIANT variant/3.0&bar|val1|0|0
setenv_path_var __MODULES_LMPREREQ $mod&variant@3.0\ bar=val1 setenv_path_var __MODULES_LMPREREQ $mod&$mod|variant@3.0\ bar=val1
setenv_path_var __MODULES_LMEXTRATAG variant/3.0&foo:$mod&bar setenv_path_var __MODULES_LMEXTRATAG variant/3.0&foo:$mod&bar
setenv_path_var __MODULES_LMTAG variant/3.0&foo&auto-loaded:$mod&bar setenv_path_var __MODULES_LMTAG variant/3.0&foo&auto-loaded:$mod&bar
set ans [list] set ans [list]
lappend ans [list unset __MODULES_LMVARIANT] lappend ans [list unset __MODULES_LMVARIANT]
lappend ans [list unset __MODULES_LMPREREQ] lappend ans [list unset __MODULES_LMPREREQ]
lappend ans [list unset _LMFILES_] lappend ans [list unset _LMFILES_]
lappend ans [list unset LOADEDMODULES] lappend ans [list unset LOADEDMODULES]
lappend ans [list unset __MODULES_LMEXTRATAG] lappend ans [list unset __MODULES_LMEXTRATAG]
lappend ans [list unset __MODULES_LMTAG] lappend ans [list unset __MODULES_LMTAG]
skipping to change at line 526 skipping to change at line 526
# test tag update on already loaded module (try-load) # test tag update on already loaded module (try-load)
unsetenv_path_var __MODULES_LMEXTRATAG unsetenv_path_var __MODULES_LMEXTRATAG
unsetenv_path_var __MODULES_LMTAG unsetenv_path_var __MODULES_LMTAG
setenv_var MODULES_ADVANCED_VERSION_SPEC 1 setenv_var MODULES_ADVANCED_VERSION_SPEC 1
setenv_var TESTSUITE_TAG_OPT loadtag4 setenv_var TESTSUITE_TAG_OPT loadtag4
setenv_loaded_module [list variant/3.0] [list $mp/variant/3.0] setenv_loaded_module [list variant/3.0] [list $mp/variant/3.0]
setenv_path_var __MODULES_LMVARIANT variant/3.0&bar|val1|0|0 setenv_path_var __MODULES_LMVARIANT variant/3.0&bar|val1|0|0
set ans [list] set ans [list]
lappend ans [list set __MODULES_LMPREREQ $mod&variant@3.0\ bar=val1] lappend ans [list set __MODULES_LMPREREQ $mod&$mod|variant@3.0\ bar=val1]
lappend ans [list set _LMFILES_ $mp/variant/3.0:$modfile] lappend ans [list set _LMFILES_ $mp/variant/3.0:$modfile]
lappend ans [list set LOADEDMODULES variant/3.0:$mod] lappend ans [list set LOADEDMODULES variant/3.0:$mod]
lappend ans [list set __MODULES_LMEXTRATAG variant/3.0&foo] lappend ans [list set __MODULES_LMEXTRATAG variant/3.0&foo]
lappend ans [list set __MODULES_LMTAG variant/3.0&foo] lappend ans [list set __MODULES_LMTAG variant/3.0&foo]
testouterr_cmd sh "load $mod" $ans {} testouterr_cmd sh "load $mod" $ans {}
setenv_path_var __MODULES_LMEXTRATAG variant/3.0&bar setenv_path_var __MODULES_LMEXTRATAG variant/3.0&bar
setenv_path_var __MODULES_LMTAG variant/3.0&bar setenv_path_var __MODULES_LMTAG variant/3.0&bar
set ans [list] set ans [list]
lappend ans [list set __MODULES_LMPREREQ $mod&variant@3.0\ bar=val1] lappend ans [list set __MODULES_LMPREREQ $mod&$mod|variant@3.0\ bar=val1]
lappend ans [list set _LMFILES_ $mp/variant/3.0:$modfile] lappend ans [list set _LMFILES_ $mp/variant/3.0:$modfile]
lappend ans [list set LOADEDMODULES variant/3.0:$mod] lappend ans [list set LOADEDMODULES variant/3.0:$mod]
lappend ans [list set __MODULES_LMEXTRATAG variant/3.0&bar&foo] lappend ans [list set __MODULES_LMEXTRATAG variant/3.0&bar&foo]
lappend ans [list set __MODULES_LMTAG variant/3.0&bar&foo] lappend ans [list set __MODULES_LMTAG variant/3.0&bar&foo]
testouterr_cmd sh "load $mod" $ans {} testouterr_cmd sh "load $mod" $ans {}
unsetenv_loaded_module unsetenv_loaded_module
unsetenv_path_var __MODULES_LMVARIANT unsetenv_path_var __MODULES_LMVARIANT
unsetenv_path_var __MODULES_LMEXTRATAG unsetenv_path_var __MODULES_LMEXTRATAG
unsetenv_path_var __MODULES_LMTAG unsetenv_path_var __MODULES_LMTAG
skipping to change at line 1170 skipping to change at line 1170
unsetenv_loaded_module unsetenv_loaded_module
unsetenv_path_var __MODULES_LMEXTRATAG unsetenv_path_var __MODULES_LMEXTRATAG
unsetenv_path_var __MODULES_LMTAG unsetenv_path_var __MODULES_LMTAG
} }
# bad prereq specifications # bad prereq specifications
setenv_var TESTSUITE_TAG_OPT prtagbad1 setenv_var TESTSUITE_TAG_OPT prtagbad1
setenv_var MODULES_ADVANCED_VERSION_SPEC 1 setenv_var MODULES_ADVANCED_VERSION_SPEC 1
setenv_var MODULES_IMPLICIT_DEFAULT 1 setenv_var MODULES_IMPLICIT_DEFAULT 1
set ans [list] set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 68}]
lappend ans [list set __MODULES_LMALTNAME foo/2.0&as|foo/default&as|foo/latest] set tserr [escre [msg_load $mod [msg_moderr {Misplaced option '--tag'} {prereq f
lappend ans [list set __MODULES_LMPREREQ $mod&foo/1.0\ --tag|foo] oo/1.0 --tag foo<EXM>} $modfile $ln]]]
lappend ans [list set _LMFILES_ $mp/foo/2.0:$modfile] testouterr_cmd_re sh "load --auto $mod" ERR $tserr
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
setenv_var MODULES_ADVANCED_VERSION_SPEC 0 setenv_var MODULES_ADVANCED_VERSION_SPEC 0
set ans [list] testouterr_cmd_re sh "load --auto $mod" ERR $tserr
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
unsetenv_var MODULES_IMPLICIT_DEFAULT unsetenv_var MODULES_IMPLICIT_DEFAULT
unsetenv_var MODULES_ADVANCED_VERSION_SPEC unsetenv_var MODULES_ADVANCED_VERSION_SPEC
setenv_var TESTSUITE_TAG_OPT prtagbad2 setenv_var TESTSUITE_TAG_OPT prtagbad2
set ans [list] set ans [list]
lappend ans [list set _LMFILES_ $modfile] lappend ans [list set _LMFILES_ $modfile]
lappend ans [list set LOADEDMODULES $mod] lappend ans [list set LOADEDMODULES $mod]
set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 71}] set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 71}]
set tserr [escre [msg_load $mod [msg_moderr {wrong # args: should be "prereq ?-- tag? ?taglist? modulefile ?...?"} {prereq --tag<EXM>} $modfile $ln]]] set tserr [escre [msg_load $mod [msg_moderr {wrong # args: should be "prereq ?-- optional? ?--tag? ?taglist? modulefile ?...?"} {prereq --tag<EXM>} $modfile $ln] ]]
testouterr_cmd_re sh "load $mod" ERR $tserr testouterr_cmd_re sh "load $mod" ERR $tserr
setenv_var TESTSUITE_TAG_OPT prtagbad3 setenv_var TESTSUITE_TAG_OPT prtagbad3
set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 74}] set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 74}]
set tserr [escre [msg_load $mod [msg_moderr {wrong # args: should be "prereq ?-- tag? ?taglist? modulefile ?...?"} {prereq --tag foo<EXM>} $modfile $ln]]] set tserr [escre [msg_load $mod [msg_moderr {wrong # args: should be "prereq ?-- optional? ?--tag? ?taglist? modulefile ?...?"} {prereq --tag foo<EXM>} $modfile $ln]]]
testouterr_cmd_re sh "load $mod" ERR $tserr testouterr_cmd_re sh "load $mod" ERR $tserr
setenv_var TESTSUITE_TAG_OPT prtagbad4 setenv_var TESTSUITE_TAG_OPT prtagbad4
set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 77}] set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 77}]
set tserr [escre [msg_load $mod [msg_moderr {Missing value for '--tag' option} { prereq --tag=<EXM>} $modfile $ln]]] set tserr [escre [msg_load $mod [msg_moderr {Missing value for '--tag' option} { prereq --tag=<EXM>} $modfile $ln]]]
testouterr_cmd_re sh "load $mod" ERR $tserr testouterr_cmd_re sh "load $mod" ERR $tserr
setenv_var TESTSUITE_TAG_OPT prtagbad5 setenv_var TESTSUITE_TAG_OPT prtagbad5
set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 80}] set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 80}]
set tserr [escre [msg_load $mod [msg_moderr {wrong # args: should be "prereq ?-- tag? ?taglist? modulefile ?...?"} {prereq --tag=foo<EXM>} $modfile $ln]]] set tserr [escre [msg_load $mod [msg_moderr {wrong # args: should be "prereq ?-- optional? ?--tag? ?taglist? modulefile ?...?"} {prereq --tag=foo<EXM>} $modfile $ln]]]
testouterr_cmd_re sh "load $mod" ERR $tserr testouterr_cmd_re sh "load $mod" ERR $tserr
setenv_var TESTSUITE_TAG_OPT prtagbad6 setenv_var TESTSUITE_TAG_OPT prtagbad6
set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 83}] set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 83}]
set tserr [escre [msg_load $mod [msg_moderr {Missing value for '--tag' option} { prereq --tag= foo/1.0<EXM>} $modfile $ln]]] set tserr [escre [msg_load $mod [msg_moderr {Missing value for '--tag' option} { prereq --tag= foo/1.0<EXM>} $modfile $ln]]]
testouterr_cmd_re sh "load $mod" ERR $tserr testouterr_cmd_re sh "load $mod" ERR $tserr
setenv_var TESTSUITE_TAG_OPT prtagbad7 setenv_var TESTSUITE_TAG_OPT prtagbad7
set ans [list] set ans [list]
lappend ans [list set _LMFILES_ $modfile] lappend ans [list set _LMFILES_ $modfile]
lappend ans [list set LOADEDMODULES $mod] lappend ans [list set LOADEDMODULES $mod]
set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 86}] set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 86}]
set tserr [escre [msg_load $mod [msg_moderr {wrong # args: should be "prereq-all ?--tag? ?taglist? modulefile ?...?"} {prereq-all --tag<EXM>} $modfile $ln]]] set tserr [escre [msg_load $mod [msg_moderr {wrong # args: should be "prereq-all ?--optional? ?--tag? ?taglist? modulefile ?...?"} {prereq-all --tag<EXM>} $modf ile $ln]]]
testouterr_cmd_re sh "load $mod" ERR $tserr testouterr_cmd_re sh "load $mod" ERR $tserr
setenv_var TESTSUITE_TAG_OPT prtagbad8 setenv_var TESTSUITE_TAG_OPT prtagbad8
set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 89}] set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 89}]
set tserr [escre [msg_load $mod [msg_moderr {wrong # args: should be "prereq ?-- tag? ?taglist? modulefile ?...?"} {prereq-any --tag foo<EXM>} $modfile $ln]]] set tserr [escre [msg_load $mod [msg_moderr {wrong # args: should be "prereq ?-- optional? ?--tag? ?taglist? modulefile ?...?"} {prereq-any --tag foo<EXM>} $modf ile $ln]]]
testouterr_cmd_re sh "load $mod" ERR $tserr testouterr_cmd_re sh "load $mod" ERR $tserr
setenv_var TESTSUITE_TAG_OPT prtagbad9 setenv_var TESTSUITE_TAG_OPT prtagbad9
set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 92}] set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 92}]
set tserr [escre [msg_load $mod [msg_moderr {Missing value for '--tag' option} { prereq-all --tag=<EXM>} $modfile $ln]]] set tserr [escre [msg_load $mod [msg_moderr {Missing value for '--tag' option} { prereq-all --tag=<EXM>} $modfile $ln]]]
testouterr_cmd_re sh "load $mod" ERR $tserr testouterr_cmd_re sh "load $mod" ERR $tserr
setenv_var TESTSUITE_TAG_OPT prtagbad10 setenv_var TESTSUITE_TAG_OPT prtagbad10
set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 95}] set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 95}]
set tserr [escre [msg_load $mod [msg_moderr {wrong # args: should be "prereq-all ?--tag? ?taglist? modulefile ?...?"} {depends-on --tag=foo<EXM>} $modfile $ln]] ] set tserr [escre [msg_load $mod [msg_moderr {wrong # args: should be "prereq-all ?--optional? ?--tag? ?taglist? modulefile ?...?"} {depends-on --tag=foo<EXM>} $ modfile $ln]]]
testouterr_cmd_re sh "load $mod" ERR $tserr testouterr_cmd_re sh "load $mod" ERR $tserr
setenv_var TESTSUITE_TAG_OPT prtagbad11 setenv_var TESTSUITE_TAG_OPT prtagbad11
set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 98}] set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 98}]
set tserr [escre [msg_load $mod [msg_moderr {Missing value for '--tag' option} { depends-on --tag= foo/1.0<EXM>} $modfile $ln]]] set tserr [escre [msg_load $mod [msg_moderr {Missing value for '--tag' option} { depends-on --tag= foo/1.0<EXM>} $modfile $ln]]]
testouterr_cmd_re sh "load $mod" ERR $tserr testouterr_cmd_re sh "load $mod" ERR $tserr
setenv_var TESTSUITE_TAG_OPT prtagbad12 setenv_var TESTSUITE_TAG_OPT prtagbad12
set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 110}] set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 110}]
set tserr [escre [msg_load $mod [msg_moderr {wrong # args: should be "always-loa d ?--tag? ?taglist? modulefile ?...?"} {always-load --tag=foo<EXM>} $modfile $ln ]]] set tserr [escre [msg_load $mod [msg_moderr {wrong # args: should be "always-loa d ?--optional? ?--tag? ?taglist? modulefile ?...?"} {always-load --tag=foo<EXM>} $modfile $ln]]]
testouterr_cmd_re sh "load $mod" ERR $tserr testouterr_cmd_re sh "load $mod" ERR $tserr
setenv_var TESTSUITE_TAG_OPT prtagbad13 setenv_var TESTSUITE_TAG_OPT prtagbad13
set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 113}] set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 113}]
set tserr [escre [msg_load $mod [msg_moderr {Missing value for '--tag' option} { always-load --tag= foo/1.0<EXM>} $modfile $ln]]] set tserr [escre [msg_load $mod [msg_moderr {Missing value for '--tag' option} { always-load --tag= foo/1.0<EXM>} $modfile $ln]]]
testouterr_cmd_re sh "load $mod" ERR $tserr testouterr_cmd_re sh "load $mod" ERR $tserr
# test verbose messages on source sub-cmd with already loaded modules # test verbose messages on source sub-cmd with already loaded modules
# 3rd module is auto-loaded, 2nd is not # 3rd module is auto-loaded, 2nd is not
# 4th module is hidden-loaded as extra tag, so it will be removed # 4th module is hidden-loaded as extra tag, so it will be removed
# see messages in normal, verbose and verbose2 mode # see messages in normal, verbose and verbose2 mode
skipping to change at line 1281 skipping to change at line 1269
unsetenv_var __MODULES_LMPREREQ unsetenv_var __MODULES_LMPREREQ
unsetenv_var __MODULES_LMTAG unsetenv_var __MODULES_LMTAG
unsetenv_var __MODULES_LMEXTRATAG unsetenv_var __MODULES_LMEXTRATAG
unsetenv_loaded_module unsetenv_loaded_module
unsetenv_var TESTSUITE_KEEP_LOADED unsetenv_var TESTSUITE_KEEP_LOADED
unsetenv_var MODULES_ADVANCED_VERSION_SPEC unsetenv_var MODULES_ADVANCED_VERSION_SPEC
# test module designation rendering with tags when module evaluation fails # test module designation rendering with tags when module evaluation fails
setenv_var TESTSUITE_TAG_OPT prtagbad2 setenv_var TESTSUITE_TAG_OPT prtagbad2
set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 71}] set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 71}]
set tserr [escre [msg_load $mod [msg_moderr {wrong # args: should be "prereq ?-- tag? ?taglist? modulefile ?...?"} {prereq --tag<EXM>} $modfile $ln]]] set tserr [escre [msg_load $mod [msg_moderr {wrong # args: should be "prereq ?-- optional? ?--tag? ?taglist? modulefile ?...?"} {prereq --tag<EXM>} $modfile $ln] ]]
testouterr_cmd_re sh "load --tag=foo $mod" ERR $tserr testouterr_cmd_re sh "load --tag=foo $mod" ERR $tserr
unsetenv_var TESTSUITE_TAG_OPT unsetenv_var TESTSUITE_TAG_OPT
# test module designation rendering with tags when module is already loaded # test module designation rendering with tags when module is already loaded
setenv_loaded_module [list $mod] [list $modfile] setenv_loaded_module [list $mod] [list $modfile]
setenv_var __MODULES_LMTAG $mod&bar setenv_var __MODULES_LMTAG $mod&bar
set tserr [msg_load "$mod <bar>" [info_alreadyloaded $mod]] set tserr [msg_load "$mod <bar>" [info_alreadyloaded $mod]]
testouterr_cmd sh "load -vv $mod" OK $tserr testouterr_cmd sh "load -vv $mod" OK $tserr
set ans [list] set ans [list]
 End of changes. 14 change blocks. 
28 lines changed or deleted 17 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)