040-restore.exp (modules-5.1.1.tar.bz2) | : | 040-restore.exp (modules-5.2.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 23 | skipping to change at line 23 | |||
# Command: | # Command: | |||
# Modulefiles: | # Modulefiles: | |||
# Sub-Command: | # Sub-Command: | |||
# | # | |||
# Comment: %C{ | # Comment: %C{ | |||
# Test the module 'restore' command | # Test the module 'restore' command | |||
# }C% | # }C% | |||
# | # | |||
############################################################################## | ############################################################################## | |||
set cbadnerrmsg "$error_msgs: Collection $collbadn cannot be found" | set cbadnerrmsg [err_coll_notfound $collbadn] | |||
set cbadfperrmsg "$error_msgs: Collection $collbadfp cannot be found" | set cbadfperrmsg [err_coll_notfound $collbadfp] | |||
set cbadterrmsg "$error_msgs: Collection $colld (for target \"$colltarget\") can | set cbadterrmsg [err_coll_notfound $colld $colltarget] | |||
not be found" | ||||
set cderrmsg "Loading loc_rc1/1.0\nLoading load/15\nLoading verssort/1.10\nload $cdmod4\nLoading $cdmod4\nLoading loc_dv2/1.0" | set cderrmsg "Loading loc_rc1/1.0\nLoading load/15\nLoading verssort/1.10\nload $cdmod4\nLoading $cdmod4\nLoading loc_dv2/1.0" | |||
set c1errmsg "Unloading loc_dv2/1.0\nload $c1mod5\nLoading $c1mod5\nload $c1mod6 \nLoading $c1mod6" | set c1errmsg "Unloading loc_dv2/1.0\nload $c1mod5\nLoading $c1mod5\nload $c1mod6 \nLoading $c1mod6" | |||
set c2errmsg "unload $c1mod6\nUnloading $c1mod6\nunload $c1mod5\nUnloading $c1mo d5\nunload $cdmod4\nUnloading $cdmod4\nload $c2mod4\nLoading $c2mod4\nload $c2mo d5\nLoading $c2mod5\nload $c2mod6\nLoading $c2mod6" | set c2errmsg "unload $c1mod6\nUnloading $c1mod6\nunload $c1mod5\nUnloading $c1mo d5\nunload $cdmod4\nUnloading $cdmod4\nload $c2mod4\nLoading $c2mod4\nload $c2mo d5\nLoading $c2mod5\nload $c2mod6\nLoading $c2mod6" | |||
set c1errmsgf2 "unload $c2mod6\nUnloading $c2mod6\nunload $c2mod5\nUnloading $c2 mod5\nunload $c2mod4\nUnloading $c2mod4\nload $cdmod4\nLoading $cdmod4\nload $c1 mod5\nLoading $c1mod5\nload $c1mod6\nLoading $c1mod6" | set c1errmsgf2 "unload $c2mod6\nUnloading $c2mod6\nunload $c2mod5\nUnloading $c2 mod5\nunload $c2mod4\nUnloading $c2mod4\nload $cdmod4\nLoading $cdmod4\nload $c1 mod5\nLoading $c1mod5\nload $c1mod6\nLoading $c1mod6" | |||
set c3errmsg "" | set c3errmsg "" | |||
set c4errmsg "unload $c2mod6\nUnloading $c2mod6\nunload $c2mod5\nUnloading $c2mo d5\nunload $c2mod4\nUnloading $c2mod4\nUnloading verssort/1.10\nUnloading load/1 5\nUnloading loc_rc1/1.0" | set c4errmsg "unload $c2mod6\nUnloading $c2mod6\nunload $c2mod5\nUnloading $c2mo d5\nunload $c2mod4\nUnloading $c2mod4\nUnloading verssort/1.10\nUnloading load/1 5\nUnloading loc_rc1/1.0" | |||
set c5errmsg $c4errmsg | set c5errmsg $c4errmsg | |||
set badcontfp "$homewithcoll/.Xresources" | set badcontfp "$homewithcoll/.Xresources" | |||
set badcontfperrmsg "$error_msgs: $badcontfp is not a valid collection" | set badcontfperrmsg [err_coll_notvalid $badcontfp] | |||
set c7errmsg "Loading $modpathre.path3/dcross/dir1/3.0\nLoading $modpathre.path2 /cross/6.0\nLoading $modpathre.path1/novercross" | set c7errmsg "Loading $modpathre.path3/dcross/dir1/3.0\nLoading $modpathre.path2 /cross/6.0\nLoading $modpathre.path1/novercross" | |||
set c8errmsg $c7errmsg | set c8errmsg $c7errmsg | |||
set c9errmsg "load $c9mod1\nLoading $c9mod1\nload $c9mod2\nLoading $c9mod2 <aL>\ nload $c9mod3\nLoading $c9mod3" | set c9errmsg "load $c9mod1\nLoading $c9mod1\nload $c9mod2\nLoading $c9mod2 <aL>\ nload $c9mod3\nLoading $c9mod3" | |||
set c10errmsg "$error_msgs: $msg_nomodnameinarg '--notuasked'" | set c10errmsg "$error_msgs: $msg_nomodnameinarg '--notuasked'" | |||
set c10errmsgb "load $c9mod1\nLoading $c9mod1\n$err_path'--notuasked'\nload $c9m od2\nLoading $c9mod2 <aL>\nload $c9mod3\nLoading $c9mod3" | set c10errmsgb "load $c9mod1\nLoading $c9mod1\n$err_path'--notuasked'\nload $c9m od2\nLoading $c9mod2 <aL>\nload $c9mod3\nLoading $c9mod3" | |||
set c9errmsg2 "unload $c9mod3\nUnloading $c9mod3\nunload $c9mod2\nUnloading $c9m od2\nload $c9mod2\nLoading $c9mod2 <aL>\nload $c9mod3\nLoading $c9mod3" | set c9errmsg2 "unload $c9mod3\nUnloading $c9mod3\nunload $c9mod2\nUnloading $c9m od2\nload $c9mod2\nLoading $c9mod2 <aL>\nload $c9mod3\nLoading $c9mod3" | |||
set c11errmsg "load $c11mod1\nLoading $c11mod1 <aL>\nload $c11mod2\nLoading $c11 mod2" | set c11errmsg "load $c11mod1\nLoading $c11mod1 <aL>\nload $c11mod2\nLoading $c11 mod2" | |||
set c12errmsg "unload $c9mod3\nUnloading $c9mod3\nunload $c9mod2\nUnloading $c9m od2\nunload $c9mod1\nUnloading $c9mod1\nload f4\nLoading f4\nload f5\nLoading f5 \n\n[msg_load f6 [err_conlo f5]]\n\n[msg_load f7 [err_reqmis f6]]" | set c12errmsg "unload $c9mod3\nUnloading $c9mod3\nunload $c9mod2\nUnloading $c9m od2\nunload $c9mod1\nUnloading $c9mod1\nload f4\nLoading f4\nload f5\nLoading f5 \n\n[msg_load f6 [err_conlo f5]]\n\n[msg_load f7 [err_reqmis f6]]" | |||
set c13errmsg $cderrmsg | set c13errmsg $cderrmsg | |||
set c14errmsg "unload m2\nUnloading m2\nload m3\nLoading m3" | set c14errmsg "unload m2\nUnloading m2\nload m3\nLoading m3" | |||
skipping to change at line 421 | skipping to change at line 421 | |||
lappend ans [list set LOADEDMODULES $c12lm] | lappend ans [list set LOADEDMODULES $c12lm] | |||
lappend ans [list set MODULEPATH $c12modpath] | lappend ans [list set MODULEPATH $c12modpath] | |||
lappend ans [list ERR] | lappend ans [list ERR] | |||
testouterr_cmd_re sh "restore $coll12fp" $ans $c12errmsg | testouterr_cmd_re sh "restore $coll12fp" $ans $c12errmsg | |||
# | # | |||
# test restoring nonexistent default collection when | # test restoring nonexistent default collection when | |||
# MODULES_COLLECTION_TARGET is set | # MODULES_COLLECTION_TARGET is set | |||
# | # | |||
testouterr_cmd "ALL" "restore" "ERR" "$cbadterrmsg" | testouterr_cmd "ALL" "restore default" "ERR" "$cbadterrmsg" | |||
# no collection name specified, if default collection does not exists | ||||
# initial environment is restored | ||||
set ans [list] | ||||
lappend ans [list unset _LMFILES_] | ||||
lappend ans [list unset LOADEDMODULES] | ||||
lappend ans [list unset MODULEPATH] | ||||
set tserr "unload $c9mod3\n[msg_unload $c9mod3] | ||||
unload $c9mod2\n[msg_unload $c9mod2] | ||||
unload $c9mod1\n[msg_unload $c9mod1]" | ||||
testouterr_cmd ALL restore $ans $tserr | ||||
# same effect if __init__ name is provided | ||||
testouterr_cmd sh {restore __init__} $ans $tserr | ||||
# set specific initial environment | ||||
setenv_var __MODULES_LMINIT "module use --append $c9modpath1:module load $c9mod3 | ||||
" | ||||
set ans [list] | ||||
lappend ans [list set _LMFILES_ $c9modpath1/$c9mod3] | ||||
lappend ans [list set LOADEDMODULES $c9mod3] | ||||
set tserr "unload $c9mod3\n[msg_unload $c9mod3] | ||||
unload $c9mod2\n[msg_unload $c9mod2] | ||||
unload $c9mod1\n[msg_unload $c9mod1] | ||||
load $c9mod3\n[msg_load $c9mod3]" | ||||
testouterr_cmd sh restore $ans $tserr | ||||
testouterr_cmd sh {restore __init__} $ans $tserr | ||||
unsetenv_var __MODULES_LMINIT | ||||
# | # | |||
# test unsetting HOME | # test unsetting HOME | |||
# | # | |||
if { $verbose > 0 } { | if { $verbose > 0 } { | |||
send_user "\tUnset HOME \n" | send_user "\tUnset HOME \n" | |||
} | } | |||
unset env(HOME) | unset env(HOME) | |||
skipping to change at line 924 | skipping to change at line 952 | |||
# tag tests | # tag tests | |||
# | # | |||
# ensure advanced_version_spec is enabled to record variant | # ensure advanced_version_spec is enabled to record variant | |||
setenv_var MODULES_ADVANCED_VERSION_SPEC 1 | setenv_var MODULES_ADVANCED_VERSION_SPEC 1 | |||
setenv_var TESTSUITE_TAG_OPT colltag1 | setenv_var TESTSUITE_TAG_OPT colltag1 | |||
set ans [list] | set ans [list] | |||
lappend ans [list set __MODULES_LMVARIANT $c37lmvr] | lappend ans [list set __MODULES_LMVARIANT $c37lmvr] | |||
lappend ans [list set __MODULES_LMPREREQ $c37mod2&variant@3.0\ bar=val1] | lappend ans [list set __MODULES_LMPREREQ $c37mod2&$c37mod2|variant@3.0\ bar=val1 ] | |||
lappend ans [list set _LMFILES_ $c37lmf] | lappend ans [list set _LMFILES_ $c37lmf] | |||
lappend ans [list set LOADEDMODULES $c37lm] | lappend ans [list set LOADEDMODULES $c37lm] | |||
lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag] | lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag] | |||
lappend ans [list set __MODULES_LMTAG $c37lmtag] | lappend ans [list set __MODULES_LMTAG $c37lmtag] | |||
set tserr [msg_load {variant/3.0{bar=val1} <aL:foo>}]\n[msg_load {tag/8.0 <bar:f oo>}] | set tserr [msg_load {variant/3.0{bar=val1} <aL:foo>}]\n[msg_load {tag/8.0 <bar:f oo>}] | |||
testouterr_cmd_re sh "restore $coll37fp" $ans $tserr | testouterr_cmd_re sh "restore $coll37fp" $ans $tserr | |||
setenv_var MODULES_COLLECTION_PIN_TAG 1 | setenv_var MODULES_COLLECTION_PIN_TAG 1 | |||
set ans [list] | set ans [list] | |||
lappend ans [list set __MODULES_LMVARIANT $c37lmvr] | lappend ans [list set __MODULES_LMVARIANT $c37lmvr] | |||
lappend ans [list set __MODULES_LMPREREQ $c37mod2&variant@3.0\ bar=val1] | lappend ans [list set __MODULES_LMPREREQ $c37mod2&$c37mod2|variant@3.0\ bar=val1 ] | |||
lappend ans [list set _LMFILES_ $c37lmf] | lappend ans [list set _LMFILES_ $c37lmf] | |||
lappend ans [list set LOADEDMODULES $c37lm] | lappend ans [list set LOADEDMODULES $c37lm] | |||
# when restoring collection saved with tags pinned, all these tags are | # when restoring collection saved with tags pinned, all these tags are | |||
# set in the extra tags when collection is restored | # set in the extra tags when collection is restored | |||
lappend ans [list set __MODULES_LMEXTRATAG $c37mod1&[join $c37mod1extratag &]:$c 37mod2&[join $c37mod2tag &]] | lappend ans [list set __MODULES_LMEXTRATAG $c37mod1&[join $c37mod1extratag &]:$c 37mod2&[join $c37mod2tag &]] | |||
lappend ans [list set __MODULES_LMTAG $c37lmtag] | lappend ans [list set __MODULES_LMTAG $c37lmtag] | |||
testouterr_cmd_re sh "restore $coll37pinfp" $ans $tserr | testouterr_cmd_re sh "restore $coll37pinfp" $ans $tserr | |||
unsetenv_var MODULES_COLLECTION_PIN_TAG | unsetenv_var MODULES_COLLECTION_PIN_TAG | |||
setenv_var __MODULES_LMVARIANT $c37lmvr | setenv_var __MODULES_LMVARIANT $c37lmvr | |||
setenv_loaded_module [list $c37mod1] [list $c37modpath1/$c37mod1] | setenv_loaded_module [list $c37mod1] [list $c37modpath1/$c37mod1] | |||
set ans [list] | set ans [list] | |||
lappend ans [list set __MODULES_LMVARIANT $c37lmvr] | lappend ans [list set __MODULES_LMVARIANT $c37lmvr] | |||
lappend ans [list set __MODULES_LMPREREQ $c37mod2&variant@3.0\ bar=val1] | lappend ans [list set __MODULES_LMPREREQ $c37mod2&$c37mod2|variant@3.0\ bar=val1 ] | |||
lappend ans [list set _LMFILES_ $c37lmf] | lappend ans [list set _LMFILES_ $c37lmf] | |||
lappend ans [list set LOADEDMODULES $c37lm] | lappend ans [list set LOADEDMODULES $c37lm] | |||
lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag] | lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag] | |||
lappend ans [list set __MODULES_LMTAG $c37lmtag] | lappend ans [list set __MODULES_LMTAG $c37lmtag] | |||
set tserr [msg_unload variant/3.0{bar=val1}]\n[msg_load {variant/3.0{bar=val1} < aL:foo>}]\n[msg_load {tag/8.0 <bar:foo>}] | set tserr [msg_unload variant/3.0{bar=val1}]\n[msg_load {variant/3.0{bar=val1} < aL:foo>}]\n[msg_load {tag/8.0 <bar:foo>}] | |||
testouterr_cmd_re sh "restore $coll37fp" $ans $tserr | testouterr_cmd_re sh "restore $coll37fp" $ans $tserr | |||
setenv_var __MODULES_LMTAG $c37mod1&auto-loaded | setenv_var __MODULES_LMTAG $c37mod1&auto-loaded | |||
set ans [list] | set ans [list] | |||
lappend ans [list set __MODULES_LMPREREQ $c37mod2&variant@3.0\ bar=val1] | lappend ans [list set __MODULES_LMPREREQ $c37mod2&$c37mod2|variant@3.0\ bar=val1 ] | |||
lappend ans [list set _LMFILES_ $c37lmf] | lappend ans [list set _LMFILES_ $c37lmf] | |||
lappend ans [list set LOADEDMODULES $c37lm] | lappend ans [list set LOADEDMODULES $c37lm] | |||
lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag] | lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag] | |||
lappend ans [list set __MODULES_LMTAG $c37mod1&auto-loaded&foo:$c37mod2&[join $c 37mod2tag &]] | lappend ans [list set __MODULES_LMTAG $c37mod1&auto-loaded&foo:$c37mod2&[join $c 37mod2tag &]] | |||
set tserr [msg_tag {variant/3.0{bar=val1} <aL:foo>}]\n[msg_load {tag/8.0 <bar:fo o>}] | set tserr [msg_tag {variant/3.0{bar=val1} <aL:foo>}]\n[msg_load {tag/8.0 <bar:fo o>}] | |||
testouterr_cmd_re sh "restore $coll37fp" $ans $tserr | testouterr_cmd_re sh "restore $coll37fp" $ans $tserr | |||
setenv_var __MODULES_LMTAG $c37mod1&foo | setenv_var __MODULES_LMTAG $c37mod1&foo | |||
setenv_var __MODULES_LMEXTRATAG $c37mod1&foo | setenv_var __MODULES_LMEXTRATAG $c37mod1&foo | |||
set ans [list] | set ans [list] | |||
lappend ans [list set __MODULES_LMVARIANT $c37lmvr] | lappend ans [list set __MODULES_LMVARIANT $c37lmvr] | |||
lappend ans [list set __MODULES_LMPREREQ $c37mod2&variant@3.0\ bar=val1] | lappend ans [list set __MODULES_LMPREREQ $c37mod2&$c37mod2|variant@3.0\ bar=val1 ] | |||
lappend ans [list set _LMFILES_ $c37lmf] | lappend ans [list set _LMFILES_ $c37lmf] | |||
lappend ans [list set LOADEDMODULES $c37lm] | lappend ans [list set LOADEDMODULES $c37lm] | |||
lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag] | lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag] | |||
lappend ans [list set __MODULES_LMTAG $c37lmtag] | lappend ans [list set __MODULES_LMTAG $c37lmtag] | |||
set tserr [msg_unload {variant/3.0{bar=val1} <foo>}]\n[msg_load {variant/3.0{bar =val1} <aL:foo>}]\n[msg_load {tag/8.0 <bar:foo>}] | set tserr [msg_unload {variant/3.0{bar=val1} <foo>}]\n[msg_load {variant/3.0{bar =val1} <aL:foo>}]\n[msg_load {tag/8.0 <bar:foo>}] | |||
testouterr_cmd_re sh "restore $coll37fp" $ans $tserr | testouterr_cmd_re sh "restore $coll37fp" $ans $tserr | |||
setenv_var __MODULES_LMTAG $c37mod1&bar | setenv_var __MODULES_LMTAG $c37mod1&bar | |||
setenv_var __MODULES_LMEXTRATAG $c37mod1&bar | setenv_var __MODULES_LMEXTRATAG $c37mod1&bar | |||
set ans [list] | set ans [list] | |||
lappend ans [list set __MODULES_LMVARIANT $c37lmvr] | lappend ans [list set __MODULES_LMVARIANT $c37lmvr] | |||
lappend ans [list set __MODULES_LMPREREQ $c37mod2&variant@3.0\ bar=val1] | lappend ans [list set __MODULES_LMPREREQ $c37mod2&$c37mod2|variant@3.0\ bar=val1 ] | |||
lappend ans [list set _LMFILES_ $c37lmf] | lappend ans [list set _LMFILES_ $c37lmf] | |||
lappend ans [list set LOADEDMODULES $c37lm] | lappend ans [list set LOADEDMODULES $c37lm] | |||
lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag] | lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag] | |||
lappend ans [list set __MODULES_LMTAG $c37lmtag] | lappend ans [list set __MODULES_LMTAG $c37lmtag] | |||
set tserr [msg_unload {variant/3.0{bar=val1} <bar>}]\n[msg_load {variant/3.0{bar =val1} <aL:foo>}]\n[msg_load {tag/8.0 <bar:foo>}] | set tserr [msg_unload {variant/3.0{bar=val1} <bar>}]\n[msg_load {variant/3.0{bar =val1} <aL:foo>}]\n[msg_load {tag/8.0 <bar:foo>}] | |||
testouterr_cmd_re sh "restore $coll37fp" $ans $tserr | testouterr_cmd_re sh "restore $coll37fp" $ans $tserr | |||
setenv_var __MODULES_LMTAG $c37mod1&bar&foo&auto-loaded | setenv_var __MODULES_LMTAG $c37mod1&bar&foo&auto-loaded | |||
setenv_var __MODULES_LMEXTRATAG $c37mod1&bar&foo | setenv_var __MODULES_LMEXTRATAG $c37mod1&bar&foo | |||
set ans [list] | set ans [list] | |||
lappend ans [list set __MODULES_LMPREREQ $c37mod2&variant@3.0\ bar=val1] | lappend ans [list set __MODULES_LMPREREQ $c37mod2&$c37mod2|variant@3.0\ bar=val1 ] | |||
lappend ans [list set _LMFILES_ $c37lmf] | lappend ans [list set _LMFILES_ $c37lmf] | |||
lappend ans [list set LOADEDMODULES $c37lm] | lappend ans [list set LOADEDMODULES $c37lm] | |||
lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag] | lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag] | |||
lappend ans [list set __MODULES_LMTAG $c37lmtag] | lappend ans [list set __MODULES_LMTAG $c37lmtag] | |||
set tserr [msg_tag {variant/3.0{bar=val1} <aL:foo>}]\n[msg_load {tag/8.0 <bar:fo o>}] | set tserr [msg_tag {variant/3.0{bar=val1} <aL:foo>}]\n[msg_load {tag/8.0 <bar:fo o>}] | |||
testouterr_cmd_re sh "restore $coll37fp" $ans $tserr | testouterr_cmd_re sh "restore $coll37fp" $ans $tserr | |||
setenv_loaded_module [list foo/1.0 $c37mod1] [list $c37modpath1/foo/1.0 $c37modp ath1/$c37mod1] | setenv_loaded_module [list foo/1.0 $c37mod1] [list $c37modpath1/foo/1.0 $c37modp ath1/$c37mod1] | |||
setenv_var __MODULES_LMTAG $c37mod1&[join $c37mod1tag &] | setenv_var __MODULES_LMTAG $c37mod1&[join $c37mod1tag &] | |||
setenv_var __MODULES_LMEXTRATAG $c37mod1&[join $c37mod1extratag &] | setenv_var __MODULES_LMEXTRATAG $c37mod1&[join $c37mod1extratag &] | |||
set ans [list] | set ans [list] | |||
lappend ans [list set __MODULES_LMVARIANT $c37lmvr] | lappend ans [list set __MODULES_LMVARIANT $c37lmvr] | |||
lappend ans [list set __MODULES_LMPREREQ $c37mod2&variant@3.0\ bar=val1] | lappend ans [list set __MODULES_LMPREREQ $c37mod2&$c37mod2|variant@3.0\ bar=val1 ] | |||
lappend ans [list set _LMFILES_ $c37lmf] | lappend ans [list set _LMFILES_ $c37lmf] | |||
lappend ans [list set LOADEDMODULES $c37lm] | lappend ans [list set LOADEDMODULES $c37lm] | |||
lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag] | lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag] | |||
lappend ans [list set __MODULES_LMTAG $c37lmtag] | lappend ans [list set __MODULES_LMTAG $c37lmtag] | |||
set tserr [msg_unload {variant/3.0{bar=val1} <aL:foo>}]\n[msg_unload foo/1.0]\n[ msg_load {variant/3.0{bar=val1} <aL:foo>}]\n[msg_load {tag/8.0 <bar:foo>}] | set tserr [msg_unload {variant/3.0{bar=val1} <aL:foo>}]\n[msg_unload foo/1.0]\n[ msg_load {variant/3.0{bar=val1} <aL:foo>}]\n[msg_load {tag/8.0 <bar:foo>}] | |||
testouterr_cmd_re sh "restore $coll37fp" $ans $tserr | testouterr_cmd_re sh "restore $coll37fp" $ans $tserr | |||
# set 2nd module auto-loaded in env, not auto-loaded in collection | # set 2nd module auto-loaded in env, not auto-loaded in collection | |||
setenv_var __MODULES_LMVARIANT $c37lmvr | setenv_var __MODULES_LMVARIANT $c37lmvr | |||
setenv_loaded_module [list $c37mod1 $c37mod2] [list $c37modpath1/$c37mod1 $c37mo dpath1/$c37mod2] | setenv_loaded_module [list $c37mod1 $c37mod2] [list $c37modpath1/$c37mod1 $c37mo dpath1/$c37mod2] | |||
setenv_var __MODULES_LMTAG $c37mod1&[join $c37mod1tag &]:$c37mod2&auto-loaded | setenv_var __MODULES_LMTAG $c37mod1&[join $c37mod1tag &]:$c37mod2&auto-loaded | |||
setenv_var __MODULES_LMEXTRATAG $c37mod1&[join $c37mod1extratag &] | setenv_var __MODULES_LMEXTRATAG $c37mod1&[join $c37mod1extratag &] | |||
set ans [list] | set ans [list] | |||
lappend ans [list set __MODULES_LMPREREQ $c37mod2&variant@3.0\ bar=val1] | lappend ans [list set __MODULES_LMPREREQ $c37mod2&$c37mod2|variant@3.0\ bar=val1 ] | |||
lappend ans [list set _LMFILES_ $c37lmf] | lappend ans [list set _LMFILES_ $c37lmf] | |||
lappend ans [list set LOADEDMODULES $c37lm] | lappend ans [list set LOADEDMODULES $c37lm] | |||
lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag] | lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag] | |||
lappend ans [list set __MODULES_LMTAG $c37lmtag] | lappend ans [list set __MODULES_LMTAG $c37lmtag] | |||
# unsetting auto-loaded tag makes module to get unloaded then loaded | # unsetting auto-loaded tag makes module to get unloaded then loaded | |||
set tserr [msg_unload {tag/8.0 <aL>}]\n[msg_load {tag/8.0 <bar:foo>}] | set tserr [msg_unload {tag/8.0 <aL>}]\n[msg_load {tag/8.0 <bar:foo>}] | |||
testouterr_cmd_re sh "restore $coll37fp" $ans $tserr | testouterr_cmd_re sh "restore $coll37fp" $ans $tserr | |||
# set modules keep-loaded in env, not keep-loaded in collection | # set modules keep-loaded in env, not keep-loaded in collection | |||
setenv_var __MODULES_LMVARIANT $c37lmvr | setenv_var __MODULES_LMVARIANT $c37lmvr | |||
skipping to change at line 1049 | skipping to change at line 1077 | |||
set tserr [msg_tag {tag/8.0 <foo:kL>}] | set tserr [msg_tag {tag/8.0 <foo:kL>}] | |||
testouterr_cmd_re sh "restore $coll37fp" $ans $tserr | testouterr_cmd_re sh "restore $coll37fp" $ans $tserr | |||
unsetenv_loaded_module | unsetenv_loaded_module | |||
unsetenv_var __MODULES_LMTAG | unsetenv_var __MODULES_LMTAG | |||
unsetenv_var __MODULES_LMEXTRATAG | unsetenv_var __MODULES_LMEXTRATAG | |||
unsetenv_var __MODULES_LMVARIANT | unsetenv_var __MODULES_LMVARIANT | |||
set ans [list] | set ans [list] | |||
lappend ans [list set __MODULES_LMVARIANT $c38lmvr] | lappend ans [list set __MODULES_LMVARIANT $c38lmvr] | |||
lappend ans [list set __MODULES_LMPREREQ $c38mod2&variant@3.0\ bar=val1] | lappend ans [list set __MODULES_LMPREREQ $c38mod2&$c37mod2|variant@3.0\ bar=val1 ] | |||
lappend ans [list set _LMFILES_ $c38lmf] | lappend ans [list set _LMFILES_ $c38lmf] | |||
lappend ans [list set LOADEDMODULES $c38lm] | lappend ans [list set LOADEDMODULES $c38lm] | |||
lappend ans [list set __MODULES_LMEXTRATAG $c38lmextratag] | lappend ans [list set __MODULES_LMEXTRATAG $c38lmextratag] | |||
lappend ans [list set __MODULES_LMTAG $c38mod1&[join $c38mod1tag &]:$c38mod2&foo &bar] | lappend ans [list set __MODULES_LMTAG $c38mod1&[join $c38mod1tag &]:$c38mod2&foo &bar] | |||
set tserr [msg_load {variant/3.0{bar=val1} <aL:foo>}]\n[msg_load {tag/8.0 <bar:f oo>}] | set tserr [msg_load {variant/3.0{bar=val1} <aL:foo>}]\n[msg_load {tag/8.0 <bar:f oo>}] | |||
testouterr_cmd_re sh "restore $coll38fp" $ans $tserr | testouterr_cmd_re sh "restore $coll38fp" $ans $tserr | |||
setenv_var MODULES_COLLECTION_PIN_TAG 1 | setenv_var MODULES_COLLECTION_PIN_TAG 1 | |||
set ans [list] | set ans [list] | |||
lappend ans [list set __MODULES_LMVARIANT $c38lmvr] | lappend ans [list set __MODULES_LMVARIANT $c38lmvr] | |||
lappend ans [list set __MODULES_LMPREREQ $c38mod2&variant@3.0\ bar=val1] | lappend ans [list set __MODULES_LMPREREQ $c38mod2&$c37mod2|variant@3.0\ bar=val1 ] | |||
lappend ans [list set _LMFILES_ $c38lmf] | lappend ans [list set _LMFILES_ $c38lmf] | |||
lappend ans [list set LOADEDMODULES $c38lm] | lappend ans [list set LOADEDMODULES $c38lm] | |||
# when restoring collection saved with tags pinned, all these tags are | # when restoring collection saved with tags pinned, all these tags are | |||
# set in the extra tags when collection is restored | # set in the extra tags when collection is restored | |||
lappend ans [list set __MODULES_LMEXTRATAG $c38mod1&[join $c38mod1extratag &]:$c 38mod2&[join $c38mod2tag &]] | lappend ans [list set __MODULES_LMEXTRATAG $c38mod1&[join $c38mod1extratag &]:$c 38mod2&[join $c38mod2tag &]] | |||
lappend ans [list set __MODULES_LMTAG $c38lmtag] | lappend ans [list set __MODULES_LMTAG $c38lmtag] | |||
set tserr [msg_load {variant/3.0{bar=val1} <aL:foo>}]\n[msg_load {tag/8.0 <bar:f oo>}] | set tserr [msg_load {variant/3.0{bar=val1} <aL:foo>}]\n[msg_load {tag/8.0 <bar:f oo>}] | |||
testouterr_cmd_re sh "restore $coll38pinfp" $ans $tserr | testouterr_cmd_re sh "restore $coll38pinfp" $ans $tserr | |||
unsetenv_var MODULES_COLLECTION_PIN_TAG | unsetenv_var MODULES_COLLECTION_PIN_TAG | |||
End of changes. 14 change blocks. | ||||
17 lines changed or deleted | 45 lines changed or added |