360-restoreenv.exp (modules-5.1.1.tar.bz2) | : | 360-restoreenv.exp (modules-5.2.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 56 | skipping to change at line 56 | |||
lappend ans [list set ts1 ok] | lappend ans [list set ts1 ok] | |||
lappend ans [list unset ts2] | lappend ans [list unset ts2] | |||
lappend ans [list alias foo bar] | lappend ans [list alias foo bar] | |||
lappend ans [list unalias bar] | lappend ans [list unalias bar] | |||
lappend ans [list xres Ileaf.popup.saveUnder True] | lappend ans [list xres Ileaf.popup.saveUnder True] | |||
lappend ans [list chdir $homere] | lappend ans [list chdir $homere] | |||
lappend ans [list echo foo] | lappend ans [list echo foo] | |||
lappend ans [list echo text] | lappend ans [list echo text] | |||
lappend ans [list set LOADEDMODULES "$module/1:$module/2"] | lappend ans [list set LOADEDMODULES "$module/1:$module/2"] | |||
lappend ans [list set _LMFILES_ "$modulepath/$module/1:$modulepath/$module/2"] | lappend ans [list set _LMFILES_ "$modulepath/$module/1:$modulepath/$module/2"] | |||
lappend ans [list set __MODULES_LMREFRESH $module/1] | ||||
testouterr_cmd_re "sh" "load $module/1 $module/2" $ans "" | testouterr_cmd_re "sh" "load $module/1 $module/2" $ans "" | |||
skip_if_quick_mode | skip_if_quick_mode | |||
set env(TSBREAK1) 1 | set env(TSBREAK1) 1 | |||
set ans [list] | set ans [list] | |||
lappend ans [list set _LMFILES_ "$modulepath/$module/2"] | lappend ans [list set _LMFILES_ "$modulepath/$module/2"] | |||
lappend ans [list set LOADEDMODULES "$module/2"] | lappend ans [list set LOADEDMODULES "$module/2"] | |||
lappend ans [list ERR] | lappend ans [list ERR] | |||
skipping to change at line 83 | skipping to change at line 84 | |||
unset env(TSBREAK1) | unset env(TSBREAK1) | |||
set env(TSBREAK2) 1 | set env(TSBREAK2) 1 | |||
set ans [list] | set ans [list] | |||
lappend ans [list alias foo bar] | lappend ans [list alias foo bar] | |||
lappend ans [list unalias bar] | lappend ans [list unalias bar] | |||
lappend ans [list xres Ileaf.popup.saveUnder True] | lappend ans [list xres Ileaf.popup.saveUnder True] | |||
lappend ans [list chdir $homere] | lappend ans [list chdir $homere] | |||
lappend ans [list echo foo] | lappend ans [list echo foo] | |||
lappend ans [list echo text] | lappend ans [list echo text] | |||
lappend ans [list set __MODULES_LMREFRESH $module/1] | ||||
lappend ans [list set _LMFILES_ "$modulepath/$module/1"] | lappend ans [list set _LMFILES_ "$modulepath/$module/1"] | |||
lappend ans [list set LOADEDMODULES "$module/1"] | lappend ans [list set LOADEDMODULES "$module/1"] | |||
lappend ans [list set ts1 ok] | lappend ans [list set ts1 ok] | |||
lappend ans [list unset ts2] | lappend ans [list unset ts2] | |||
lappend ans [list ERR] | lappend ans [list ERR] | |||
testouterr_cmd_re "sh" "load $module/1 $module/2" $ans [msg_load $module/2 $err_ evalabort] | testouterr_cmd_re "sh" "load $module/1 $module/2" $ans [msg_load $module/2 $err_ evalabort] | |||
set ans [list] | set ans [list] | |||
lappend ans [list set ts1 ok] | lappend ans [list set ts1 ok] | |||
lappend ans [list unset ts2] | lappend ans [list unset ts2] | |||
lappend ans [list alias foo bar] | lappend ans [list alias foo bar] | |||
lappend ans [list unalias bar] | lappend ans [list unalias bar] | |||
lappend ans [list xres Ileaf.popup.saveUnder True] | lappend ans [list xres Ileaf.popup.saveUnder True] | |||
lappend ans [list chdir $homere] | lappend ans [list chdir $homere] | |||
lappend ans [list echo foo] | lappend ans [list echo foo] | |||
lappend ans [list echo text] | lappend ans [list echo text] | |||
lappend ans [list set LOADEDMODULES "$module/1"] | lappend ans [list set LOADEDMODULES "$module/1"] | |||
lappend ans [list set _LMFILES_ "$modulepath/$module/1"] | lappend ans [list set _LMFILES_ "$modulepath/$module/1"] | |||
lappend ans [list set __MODULES_LMREFRESH $module/1] | ||||
lappend ans [list ERR] | lappend ans [list ERR] | |||
testouterr_cmd_re "sh" "load $module/2 $module/1" $ans [msg_load $module/2 $err_ evalabort] | testouterr_cmd_re "sh" "load $module/2 $module/1" $ans [msg_load $module/2 $err_ evalabort] | |||
unset env(TSBREAK2) | unset env(TSBREAK2) | |||
# | # | |||
# test unload mode | # test unload mode | |||
# | # | |||
setenv_loaded_module [list "$module/1" "$module/2"] [list "$modulepath/$module/1 " "$modulepath/$module/2"] | setenv_loaded_module [list "$module/1" "$module/2"] [list "$modulepath/$module/1 " "$modulepath/$module/2"] | |||
setenv_var __MODULES_LMREFRESH $module/1 | ||||
set ans [list] | set ans [list] | |||
lappend ans [list unset ts1] | lappend ans [list unset ts1] | |||
lappend ans [list unalias foo] | lappend ans [list unalias foo] | |||
lappend ans [list unxres Ileaf.popup.saveUnder] | lappend ans [list unxres Ileaf.popup.saveUnder] | |||
lappend ans [list echo foo] | lappend ans [list echo foo] | |||
lappend ans [list echo text] | lappend ans [list echo text] | |||
lappend ans [list unset __MODULES_LMREFRESH] | ||||
lappend ans [list unset LOADEDMODULES] | lappend ans [list unset LOADEDMODULES] | |||
lappend ans [list unset _LMFILES_] | lappend ans [list unset _LMFILES_] | |||
testouterr_cmd_re "sh" "unload $module/1 $module/2" $ans "" | testouterr_cmd_re "sh" "unload $module/1 $module/2" $ans "" | |||
set env(TSBREAK1) 1 | set env(TSBREAK1) 1 | |||
set ans [list] | set ans [list] | |||
lappend ans [list set _LMFILES_ "$modulepath/$module/1"] | lappend ans [list set _LMFILES_ "$modulepath/$module/1"] | |||
lappend ans [list set LOADEDMODULES "$module/1"] | lappend ans [list set LOADEDMODULES "$module/1"] | |||
lappend ans [list ERR] | lappend ans [list ERR] | |||
skipping to change at line 145 | skipping to change at line 150 | |||
unset env(TSBREAK1) | unset env(TSBREAK1) | |||
set env(TSBREAK2) 1 | set env(TSBREAK2) 1 | |||
set ans [list] | set ans [list] | |||
lappend ans [list unalias foo] | lappend ans [list unalias foo] | |||
lappend ans [list unxres Ileaf.popup.saveUnder] | lappend ans [list unxres Ileaf.popup.saveUnder] | |||
lappend ans [list echo foo] | lappend ans [list echo foo] | |||
lappend ans [list echo text] | lappend ans [list echo text] | |||
lappend ans [list set _LMFILES_ "$modulepath/$module/2"] | lappend ans [list set _LMFILES_ "$modulepath/$module/2"] | |||
lappend ans [list set LOADEDMODULES "$module/2"] | lappend ans [list set LOADEDMODULES "$module/2"] | |||
lappend ans [list unset __MODULES_LMREFRESH] | ||||
lappend ans [list unset ts1] | lappend ans [list unset ts1] | |||
lappend ans [list ERR] | lappend ans [list ERR] | |||
testouterr_cmd_re "sh" "unload $module/1 $module/2" $ans [msg_unload $module/2 $ err_evalabort] | testouterr_cmd_re "sh" "unload $module/1 $module/2" $ans [msg_unload $module/2 $ err_evalabort] | |||
set ans [list] | set ans [list] | |||
lappend ans [list unset ts1] | lappend ans [list unset ts1] | |||
lappend ans [list unalias foo] | lappend ans [list unalias foo] | |||
lappend ans [list unxres Ileaf.popup.saveUnder] | lappend ans [list unxres Ileaf.popup.saveUnder] | |||
lappend ans [list echo foo] | lappend ans [list echo foo] | |||
lappend ans [list echo text] | lappend ans [list echo text] | |||
lappend ans [list unset __MODULES_LMREFRESH] | ||||
lappend ans [list set LOADEDMODULES "$module/2"] | lappend ans [list set LOADEDMODULES "$module/2"] | |||
lappend ans [list set _LMFILES_ "$modulepath/$module/2"] | lappend ans [list set _LMFILES_ "$modulepath/$module/2"] | |||
lappend ans [list ERR] | lappend ans [list ERR] | |||
testouterr_cmd_re "sh" "unload $module/2 $module/1" $ans [msg_unload $module/2 $ err_evalabort] | testouterr_cmd_re "sh" "unload $module/2 $module/1" $ans [msg_unload $module/2 $ err_evalabort] | |||
unset env(TSBREAK2) | unset env(TSBREAK2) | |||
unsetenv_var __MODULES_LMREFRESH | ||||
# test context restore when break occurs on an unload phase then an environment variable is used in multiple modulefiles for their load | # test context restore when break occurs on an unload phase then an environment variable is used in multiple modulefiles for their load | |||
setenv_loaded_module [list $module/0.1 $module/0.2] [list $modulepath/$module/0. 1 $modulepath/$module/0.2] [list $modulepath/$module/0.1] | setenv_loaded_module [list $module/0.1 $module/0.2] [list $modulepath/$module/0. 1 $modulepath/$module/0.2] [list $modulepath/$module/0.1] | |||
testouterr_cmd sh {save ./testcoll} {} {} | testouterr_cmd sh {save ./testcoll} {} {} | |||
setenv_loaded_module [list $module/2] [list $modulepath/$module/2] | setenv_loaded_module [list $module/2] [list $modulepath/$module/2] | |||
setenv_var TSBREAK2 1 | setenv_var TSBREAK2 1 | |||
set ans [list] | set ans [list] | |||
lappend ans [list set ts02 ok] | lappend ans [list set ts02 ok] | |||
lappend ans [list set ts01a ok] | lappend ans [list set ts01a ok] | |||
lappend ans [list set _LMFILES_ $modulepath/$module/2:$modulepath/$module/0.1:$m odulepath/$module/0.2] | lappend ans [list set _LMFILES_ $modulepath/$module/2:$modulepath/$module/0.1:$m odulepath/$module/0.2] | |||
End of changes. 8 change blocks. | ||||
0 lines changed or deleted | 8 lines changed or added |