078-refresh.exp (modules-5.1.1.tar.bz2) | : | 078-refresh.exp (modules-5.2.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 41 | skipping to change at line 41 | |||
set modulefile1 "$modpath/$module1" | set modulefile1 "$modpath/$module1" | |||
set module2 "setenv/1.0" | set module2 "setenv/1.0" | |||
set modulefile2 "$modpath/$module2" | set modulefile2 "$modpath/$module2" | |||
set alias "ps -auxww | grep modulecmd" | set alias "ps -auxww | grep modulecmd" | |||
# | # | |||
# Set up the environment for refresh ... | # Set up the environment for refresh ... | |||
# | # | |||
setenv_loaded_module $module1 $modulefile1 | setenv_loaded_module $module1 $modulefile1 | |||
setenv_var __MODULES_LMREFRESH $module1 | ||||
# | # | |||
# For the different shells ... | # For the different shells ... | |||
# | # | |||
lappend ans [list alias testsuite $alias] | lappend ans [list alias testsuite $alias] | |||
# | # | |||
# The tests | # The tests | |||
# | # | |||
skipping to change at line 83 | skipping to change at line 84 | |||
# | # | |||
# Check 'refresh' evaluation mode | # Check 'refresh' evaluation mode | |||
# | # | |||
set mp $modpath.3 | set mp $modpath.3 | |||
setenv_path_var MODULEPATH $mp | setenv_path_var MODULEPATH $mp | |||
# nothing to refresh in loaded modules | # nothing to refresh in loaded modules | |||
setenv_loaded_module [list foo/1.0 bar/1.0] [list $mp/foo/1.0 $mp/bar/1.0] | setenv_loaded_module [list foo/1.0 bar/1.0] [list $mp/foo/1.0 $mp/bar/1.0] | |||
unsetenv_var __MODULES_LMREFRESH | ||||
testouterr_cmd ALL refresh OK {} | testouterr_cmd ALL refresh OK {} | |||
# many things to refresh | # many things to refresh | |||
setenv_loaded_module refresh/1.0 $mp/refresh/1.0 | setenv_loaded_module refresh/1.0 $mp/refresh/1.0 | |||
setenv_var __MODULES_LMREFRESH refresh/1.0 | ||||
setenv_var FOO value | setenv_var FOO value | |||
setenv_path_var BAR value othervalue | setenv_path_var BAR value othervalue | |||
set ans [list] | set ans [list] | |||
lappend ans [list alias altags {echo loaded}] | lappend ans [list alias altags {echo loaded}] | |||
lappend ans [list alias alspec {echo refresh/1.0}] | lappend ans [list alias alspec {echo refresh/1.0}] | |||
lappend ans [list alias alcmd {echo refresh}] | lappend ans [list alias alcmd {echo refresh}] | |||
lappend ans [list alias alfoo {echo foo1}] | lappend ans [list alias alfoo {echo foo1}] | |||
lappend ans [list alias almode {echo refresh}] | lappend ans [list alias almode {echo refresh}] | |||
lappend ans [list alias alisavail {echo is-avail ok}] | lappend ans [list alias alisavail {echo is-avail ok}] | |||
skipping to change at line 119 | skipping to change at line 122 | |||
lappend ans [list alias alfoo {echo foo1}] | lappend ans [list alias alfoo {echo foo1}] | |||
lappend ans [list alias almode {echo refresh}] | lappend ans [list alias almode {echo refresh}] | |||
lappend ans [list alias alisavail {echo is-avail ok}] | lappend ans [list alias alisavail {echo is-avail ok}] | |||
lappend ans [list alias algetenv {echo getenv ok}] | lappend ans [list alias algetenv {echo getenv ok}] | |||
lappend ans [list funcfoo "() {" "echo foo1; };"] | lappend ans [list funcfoo "() {" "echo foo1; };"] | |||
lappend ans [list out {echo refresh/1.0}] | lappend ans [list out {echo refresh/1.0}] | |||
testouterr_cmd sh {refresh} $ans {} | testouterr_cmd sh {refresh} $ans {} | |||
# test tags and variant | # test tags and variant | |||
setenv_loaded_module refresh/2.0 $mp/refresh/2.0 | setenv_loaded_module refresh/2.0 $mp/refresh/2.0 | |||
setenv_var __MODULES_LMREFRESH refresh/2.0 | ||||
setenv_var __MODULES_LMTAG refresh/2.0&bar | setenv_var __MODULES_LMTAG refresh/2.0&bar | |||
setenv_var MODULES_ADVANCED_VERSION_SPEC 1 | setenv_var MODULES_ADVANCED_VERSION_SPEC 1 | |||
setenv_var __MODULES_LMVARIANT refresh/2.0&foo|1|1|0 | setenv_var __MODULES_LMVARIANT refresh/2.0&foo|1|1|0 | |||
set ans [list] | set ans [list] | |||
lappend ans [list alias altags {echo bar loaded}] | lappend ans [list alias altags {echo bar loaded}] | |||
lappend ans [list alias alspec {echo refresh/2.0}] | lappend ans [list alias alspec {echo refresh/2.0}] | |||
lappend ans [list alias alfoo {echo foo2}] | lappend ans [list alias alfoo {echo foo2}] | |||
lappend ans [list funcfoo "() {" "echo foo2; };"] | lappend ans [list funcfoo "() {" "echo foo2; };"] | |||
lappend ans [list out {echo refresh/2.0}] | lappend ans [list out {echo refresh/2.0}] | |||
testouterr_cmd sh {refresh} $ans {} | testouterr_cmd sh {refresh} $ans {} | |||
# test evaluation order | # test evaluation order | |||
setenv_loaded_module [list refresh/1.0 refresh/2.0] [list $mp/refresh/1.0 $mp/re fresh/2.0] | setenv_loaded_module [list refresh/1.0 refresh/2.0] [list $mp/refresh/1.0 $mp/re fresh/2.0] | |||
setenv_var __MODULES_LMREFRESH refresh/1.0:refresh/2.0 | ||||
setenv_var __MODULES_LMTAG refresh/2.0&bar | setenv_var __MODULES_LMTAG refresh/2.0&bar | |||
set ans [list] | set ans [list] | |||
lappend ans [list alias altags {echo bar loaded}] | lappend ans [list alias altags {echo bar loaded}] | |||
lappend ans [list alias alspec {echo refresh/2.0}] | lappend ans [list alias alspec {echo refresh/2.0}] | |||
lappend ans [list alias alisloaded2 {echo is-loaded ok}] | lappend ans [list alias alisloaded2 {echo is-loaded ok}] | |||
lappend ans [list alias alcmd {echo refresh}] | lappend ans [list alias alcmd {echo refresh}] | |||
lappend ans [list alias alfoo {echo foo2}] | lappend ans [list alias alfoo {echo foo2}] | |||
lappend ans [list alias almode {echo refresh}] | lappend ans [list alias almode {echo refresh}] | |||
lappend ans [list alias alisavail {echo is-avail ok}] | lappend ans [list alias alisavail {echo is-avail ok}] | |||
skipping to change at line 199 | skipping to change at line 204 | |||
set tserr2 [msg_refresh refresh/1.0]\n[msg_refresh {refresh/2.0{+foo} <aL:bar:H> }] | set tserr2 [msg_refresh refresh/1.0]\n[msg_refresh {refresh/2.0{+foo} <aL:bar:H> }] | |||
testouterr_cmd sh {refresh -vv} $ans $tserr2 | testouterr_cmd sh {refresh -vv} $ans $tserr2 | |||
setenv_var __MODULES_LMTAG refresh/1.0&hidden-loaded&auto-loaded:refresh/2.0&bar &hidden-loaded&auto-loaded | setenv_var __MODULES_LMTAG refresh/1.0&hidden-loaded&auto-loaded:refresh/2.0&bar &hidden-loaded&auto-loaded | |||
testouterr_cmd sh {refresh -v} $ans {} | testouterr_cmd sh {refresh -v} $ans {} | |||
set tserr2 [msg_refresh {refresh/1.0 <aL:H>}]\n[msg_refresh {refresh/2.0{+foo} < aL:bar:H>}] | set tserr2 [msg_refresh {refresh/1.0 <aL:H>}]\n[msg_refresh {refresh/2.0{+foo} < aL:bar:H>}] | |||
testouterr_cmd sh {refresh -vv} $ans $tserr2 | testouterr_cmd sh {refresh -vv} $ans $tserr2 | |||
unsetenv_var __MODULES_LMTAG | unsetenv_var __MODULES_LMTAG | |||
# test alias/function set through source-sh | # test alias/function set through source-sh | |||
setenv_loaded_module [list refresh/3.0] [list $mp/refresh/3.0] | setenv_loaded_module [list refresh/3.0] [list $mp/refresh/3.0] | |||
setenv_var __MODULES_LMREFRESH refresh/3.0 | ||||
set ans [list] | set ans [list] | |||
lappend ans [list alias alsp {echo f\"o; echo b\\\"r; echo f\'o}] | lappend ans [list alias alsp {echo f\"o; echo b\\\"r; echo f\'o}] | |||
lappend ans [list alias alfoo {echo $(grep "report .Modules " ../../modulecmd.tc l | tr -d \\ 2>/dev/null | awk '{print $3}')}] | lappend ans [list alias alfoo {echo $(grep "report .Modules " ../../modulecmd.tc l | tr -d \\ 2>/dev/null | awk '{print $3}')}] | |||
lappend ans [list alias alcb echo\ f\{o] | lappend ans [list alias alcb echo\ f\{o] | |||
lappend ans [list alias alem {}] | lappend ans [list alias alem {}] | |||
lappend ans [list funcfoo "() { echo foo; };"] | lappend ans [list funcfoo "() { echo foo; };"] | |||
lappend ans [list funccb "() { echo f\{o; };"] | lappend ans [list funccb "() { echo f\{o; };"] | |||
lappend ans [list funcwc "() { echo sou*sh; };"] | lappend ans [list funcwc "() { echo sou*sh; };"] | |||
lappend ans [list funcnl "() { echo foo; | lappend ans [list funcnl "() { echo foo; | |||
skipping to change at line 220 | skipping to change at line 226 | |||
lappend ans [list funcsp "() { echo f\\\"o; | lappend ans [list funcsp "() { echo f\\\"o; | |||
echo b\\\\\\\"r; | echo b\\\\\\\"r; | |||
echo f\\'o; };"] | echo f\\'o; };"] | |||
testouterr_cmd sh {refresh} $ans {} | testouterr_cmd sh {refresh} $ans {} | |||
# | # | |||
# error during refresh evaluation | # error during refresh evaluation | |||
# | # | |||
setenv_loaded_module [list refresh/1.0 refresh/2.0] [list $mp/refresh/1.0 $mp/re fresh/2.0] | setenv_loaded_module [list refresh/1.0 refresh/2.0] [list $mp/refresh/1.0 $mp/re fresh/2.0] | |||
setenv_var __MODULES_LMREFRESH refresh/1.0:refresh/2.0 | ||||
setenv_var __MODULES_LMTAG refresh/2.0&bar | setenv_var __MODULES_LMTAG refresh/2.0&bar | |||
# break during evaluation | # break during evaluation | |||
setenv_var TESTSUITE_REFRESH break1 | setenv_var TESTSUITE_REFRESH break1 | |||
set ans1 [list] | set ans1 [list] | |||
lappend ans1 [list alias altags {echo bar loaded}] | lappend ans1 [list alias altags {echo bar loaded}] | |||
lappend ans1 [list alias alspec {echo refresh/2.0}] | lappend ans1 [list alias alspec {echo refresh/2.0}] | |||
lappend ans1 [list alias alfoo {echo foo2}] | lappend ans1 [list alias alfoo {echo foo2}] | |||
lappend ans1 [list alias alisloaded1 {echo is-loaded ok}] | lappend ans1 [list alias alisloaded1 {echo is-loaded ok}] | |||
lappend ans1 [list funcfoo "() {" "echo foo2; };"] | lappend ans1 [list funcfoo "() {" "echo foo2; };"] | |||
skipping to change at line 339 | skipping to change at line 346 | |||
testouterr_cmd sh {refresh -v} $ans $tserr | testouterr_cmd sh {refresh -v} $ans $tserr | |||
# exit command | # exit command | |||
setenv_var TESTSUITE_REFRESH exit1 | setenv_var TESTSUITE_REFRESH exit1 | |||
set tserr [msg_refresh refresh/1.0 $err_evalabort] | set tserr [msg_refresh refresh/1.0 $err_evalabort] | |||
testouterr_cmd sh {refresh} ERR $tserr | testouterr_cmd sh {refresh} ERR $tserr | |||
setenv_var TESTSUITE_REFRESH exit2 | setenv_var TESTSUITE_REFRESH exit2 | |||
set tserr [msg_refresh {refresh/2.0{+foo} <bar>} $err_evalabort] | set tserr [msg_refresh {refresh/2.0{+foo} <bar>} $err_evalabort] | |||
testouterr_cmd sh {refresh} $ans2 $tserr | testouterr_cmd sh {refresh} $ans2 $tserr | |||
# verbose output, 2 module loaded, only one made for refresh | ||||
setenv_loaded_module [list refresh/4.0 refresh/6.0] [list $mp/refresh/4.0 $mp/re | ||||
fresh/6.0] | ||||
setenv_var __MODULES_LMREFRESH refresh/4.0 | ||||
set ans [list] | ||||
lappend ans [list alias alfoo {echo foo4}] | ||||
lappend ans [list funcfoo "() {" "echo foo4; };"] | ||||
set tserr [msg_refresh refresh/4.0] | ||||
testouterr_cmd sh {refresh -v} $ans $tserr | ||||
# | # | |||
# Cleanup | # Cleanup | |||
# | # | |||
reset_test_env | reset_test_env | |||
End of changes. 8 change blocks. | ||||
0 lines changed or deleted | 17 lines changed or added |