ts: adapt existing tests to __MODULES_LMREFRESH

Author: xdelaruelle

testsuite/install.00-init/025-autoinit.exp

@@ -51,6 +51,7 @@ if {$install_ml eq {y}} {
 # test loaded module refresh performed during autoinit
 setenv_path_var MODULEPATH $testsuite_modpath.3
 setenv_loaded_module [list refresh/4.0] [list $testsuite_modpath.3/refresh/4.0]
+setenv_var __MODULES_LMREFRESH refresh/4.0
 
 foreach shell $shell_list {
    if {$shell in {csh tcsh}} {

testsuite/modules.20-locate/130-mcookie_check_eval.exp

@@ -86,6 +86,7 @@ testouterr_cmd_re sh "test $modname" ERR $tserr
 
 # module has been loaded
 setenv_loaded_module [list $mod] [list $modfile]
+setenv_var __MODULES_LMREFRESH $mod
 set tserr [msg_unload $mod [moderr_missingmcookiens $modfile]]
 testouterr_cmd sh "unload $mod" ERR $tserr
 testouterr_cmd sh reload ERR $tserr
@@ -97,6 +98,7 @@ testouterr_cmd sh {list -t} OK $tserr
 set tserr $list_long_headerre\n$cur_loaded\n$mod\\s*$datetimere
 testouterr_cmd_re sh {list -l} OK $tserr
 unsetenv_loaded_module
+unsetenv_var __MODULES_LMREFRESH
 
 # global search commands
 set tserr "$mp:\n$modname/1.0\n$modname/2.0\n$mod"
@@ -154,6 +156,7 @@ testouterr_cmd_re sh "test $modname" ERR $tserr
 
 # module has been loaded
 setenv_loaded_module [list $mod] [list $modfile]
+setenv_var __MODULES_LMREFRESH $mod
 set tserr [msg_unload $mod [moderr_minverreqns $modfile 99]]
 testouterr_cmd sh "unload $mod" ERR $tserr
 testouterr_cmd sh reload ERR $tserr
@@ -165,6 +168,7 @@ testouterr_cmd sh {list -t} OK $tserr
 set tserr $list_long_headerre\n$cur_loaded\n$mod\\s*$datetimere
 testouterr_cmd_re sh {list -l} OK $tserr
 unsetenv_loaded_module
+unsetenv_var __MODULES_LMREFRESH
 
 # global search commands
 set tserr "$mp:\n$mod\n${modname}rc/1"
@@ -235,6 +239,7 @@ testouterr_cmd_re sh "test $modname" ERR $tserr
 
 # module has been loaded
 setenv_loaded_module [list $mod] [list $modfile]
+setenv_var __MODULES_LMREFRESH $mod
 set tserr [msg_unload $mod [err_permdenied $modfile]]
 testouterr_cmd sh "unload $mod" ERR $tserr
 testouterr_cmd sh reload ERR $tserr
@@ -246,6 +251,7 @@ testouterr_cmd sh {list -t} OK $tserr
 set tserr $list_long_headerre\n$cur_loaded\n$mod\\s*$datetimere
 testouterr_cmd_re sh {list -l} OK $tserr
 unsetenv_loaded_module
+unsetenv_var __MODULES_LMREFRESH
 
 # global search commands
 set tserr "$mp:\n$modname/1.0\n$modname/2.0\n$mod"
@@ -296,6 +302,7 @@ testouterr_cmd sh "test $modname" ERR $tserr
 
 # module has been loaded
 setenv_loaded_module [list $mod] [list $modfile]
+setenv_var __MODULES_LMREFRESH $mod
 set tserr [msg_unload $mod [err_permdenied $modfile]]
 testouterr_cmd sh "unload $mod" ERR $tserr
 testouterr_cmd sh reload ERR $tserr
@@ -307,6 +314,7 @@ testouterr_cmd sh {list -t} OK $tserr
 set tserr $list_long_headerre\n$cur_loaded\n$mod\\s*
 testouterr_cmd_re sh {list -l} OK $tserr
 unsetenv_loaded_module
+unsetenv_var __MODULES_LMREFRESH
 
 # global search commands
 testouterr_cmd sh "avail -t $modname" OK {}
@@ -368,6 +376,7 @@ testouterr_cmd_re sh "test $modname" OK $tserr
 
 # module has been loaded
 setenv_loaded_module [list $mod] [list $modfile]
+setenv_var __MODULES_LMREFRESH $mod
 set tserr [msg_unload $mod [err_permdenied $modfile]]
 testouterr_cmd sh "unload $mod" ERR $tserr
 testouterr_cmd sh reload ERR $tserr
@@ -379,6 +388,7 @@ testouterr_cmd sh {list -t} OK $tserr
 set tserr $list_long_headerre\n$cur_loaded\n$mod\\s*$datetimere
 testouterr_cmd_re sh {list -l} OK $tserr
 unsetenv_loaded_module
+unsetenv_var __MODULES_LMREFRESH
 
 # global search commands
 set tserr "$mp:\n$modname/1.0(foo)"
@@ -418,6 +428,7 @@ testouterr_cmd_re sh "test $modname" ERR $tserr
 
 # module has been loaded
 setenv_loaded_module [list $mod] [list $modfile]
+setenv_var __MODULES_LMREFRESH $mod
 set tserr [msg_unload $mod [moderr_missingmcookiens $modfile]]
 testouterr_cmd sh "unload $mod" ERR $tserr
 testouterr_cmd sh reload ERR $tserr
@@ -429,6 +440,7 @@ testouterr_cmd sh {list -t} OK $tserr
 set tserr $list_long_headerre\n$cur_loaded\n$mod\\s*$datetimere
 testouterr_cmd_re sh {list -l} OK $tserr
 unsetenv_loaded_module
+unsetenv_var __MODULES_LMREFRESH
 
 # global search commands
 set tserr "$mp:\n$modname/1.0\n${mod}(default)"
@@ -486,6 +498,7 @@ testouterr_cmd_re sh "test $modname" ERR $tserr
 
 # module has been loaded
 setenv_loaded_module [list $mod] [list $modfile]
+setenv_var __MODULES_LMREFRESH $mod
 set tserr [msg_unload $mod [moderr_missingmcookiens $modfile]]
 testouterr_cmd sh "unload $mod" ERR $tserr
 testouterr_cmd sh reload ERR $tserr
@@ -497,6 +510,7 @@ testouterr_cmd sh {list -t} OK $tserr
 set tserr $list_long_headerre\n$cur_loaded\n$mod\\s*$datetimere
 testouterr_cmd_re sh {list -l} OK $tserr
 unsetenv_loaded_module
+unsetenv_var __MODULES_LMREFRESH
 
 # global search commands
 set tserr "$mp:\n$modname/1.0\n$modname/2.0\n$mod"

testsuite/modules.50-cmds/075-alias.exp

@@ -35,6 +35,7 @@ set alias "ps -auxww | grep modulecmd"
 #  For the different shells ...
 #
 
+lappend ans [list set __MODULES_LMREFRESH $module]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
 lappend ans [list alias testsuite $alias]

testsuite/modules.50-cmds/076-alias-sub.exp

@@ -41,14 +41,17 @@ set alias_csh {ls !!:1 !!:2 | grep !*}
 #  For the different shells ...
 #
 
+lappend ans [list set __MODULES_LMREFRESH $module]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
 lappend ans [list alias testsuite $alias]
 
+lappend ans2 [list set __MODULES_LMREFRESH $module]
 lappend ans2 [list set _LMFILES_ $modulefile]
 lappend ans2 [list set LOADEDMODULES $module]
 lappend ans2 [list alias testsuite $alias_csh]
 
+lappend ans3 [list set __MODULES_LMREFRESH $module]
 lappend ans3 [list set _LMFILES_ $modulefile]
 lappend ans3 [list set LOADEDMODULES $module]
 lappend ans3 [list alias testsuite $alias]
@@ -80,18 +83,21 @@ set module "alias/3.0"
 set modulefile "$modpath/$module"
 
 set ans [list]
+lappend ans [list set __MODULES_LMREFRESH $module]
 lappend ans [list set _LMFILES_ $modulefile]
 lappend ans [list set LOADEDMODULES $module]
 lappend ans [list alias ts2 {echo "http://an.example.web?&param=one"}]
 lappend ans [list alias testsuite {echo $(grep "report .Modules " modulecmd.tcl | tr -d \\ | awk '{print $3}')}]
 
 set ans2 [list]
+lappend ans2 [list set __MODULES_LMREFRESH $module]
 lappend ans2 [list set _LMFILES_ $modulefile]
 lappend ans2 [list set LOADEDMODULES $module]
 lappend ans2 [list alias ts2 {echo "http://an.example.web?&param=one"}]
 lappend ans2 [list alias testsuite {echo `grep "report .Modules " modulecmd.tcl | tr -d \\ | awk '{print $3}'`}]
 
 set ans3 [list]
+lappend ans3 [list set __MODULES_LMREFRESH $module]
 lappend ans3 [list set _LMFILES_ $modulefile]
 lappend ans3 [list set LOADEDMODULES $module]
 lappend ans3 [list alias ts2 {echo "http://an.example.web?&param=one"}]

testsuite/modules.50-cmds/077-alias-undo.exp

@@ -35,13 +35,15 @@ set modulefile "$modpath/$module"
 #
 
 setenv_loaded_module $module $modulefile
+setenv_var __MODULES_LMREFRESH $module
 
 #
 #  For the different shells ...
 #
 
 lappend ans [list unset _LMFILES_]
 lappend ans [list unset LOADEDMODULES]
+lappend ans [list unset __MODULES_LMREFRESH]
 lappend ans [list unalias testsuite]
 
 #

testsuite/modules.50-cmds/078-refresh.exp

@@ -38,6 +38,7 @@ set alias "ps -auxww | grep modulecmd"
 #
 
 setenv_loaded_module $module1 $modulefile1
+setenv_var __MODULES_LMREFRESH $module1
 
 #
 #  For the different shells ...
@@ -81,10 +82,12 @@ setenv_path_var MODULEPATH $mp
 
 # 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]
+unsetenv_var __MODULES_LMREFRESH
 testouterr_cmd ALL refresh OK {}
 
 # many things to refresh
 setenv_loaded_module refresh/1.0 $mp/refresh/1.0
+setenv_var __MODULES_LMREFRESH refresh/1.0
 setenv_var FOO value
 setenv_path_var BAR value othervalue
 
@@ -117,6 +120,7 @@ testouterr_cmd sh {refresh} $ans {}
 
 # test tags and variant
 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_ADVANCED_VERSION_SPEC 1
 setenv_var __MODULES_LMVARIANT refresh/2.0&foo|1|1|0
@@ -131,6 +135,7 @@ testouterr_cmd sh {refresh} $ans {}
 
 # test evaluation order
 setenv_loaded_module [list refresh/1.0 refresh/2.0] [list $mp/refresh/1.0 $mp/refresh/2.0]
+setenv_var __MODULES_LMREFRESH refresh/1.0:refresh/2.0
 setenv_var __MODULES_LMTAG refresh/2.0&bar
 
 set ans [list]
@@ -197,6 +202,7 @@ unsetenv_var __MODULES_LMTAG
 
 # test alias/function set through source-sh
 setenv_loaded_module [list refresh/3.0] [list $mp/refresh/3.0]
+setenv_var __MODULES_LMREFRESH refresh/3.0
 
 set ans [list]
 lappend ans [list alias alsp {echo f\"o; echo b\\\"r; echo f\'o}]
@@ -218,6 +224,7 @@ testouterr_cmd sh {refresh} $ans {}
 #
 
 setenv_loaded_module [list refresh/1.0 refresh/2.0] [list $mp/refresh/1.0 $mp/refresh/2.0]
+setenv_var __MODULES_LMREFRESH refresh/1.0:refresh/2.0
 setenv_var __MODULES_LMTAG refresh/2.0&bar
 
 # break during evaluation
@@ -337,6 +344,15 @@ setenv_var TESTSUITE_REFRESH exit2
 set tserr [msg_refresh {refresh/2.0{+foo} <bar>} $err_evalabort]
 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/refresh/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

testsuite/modules.50-cmds/083-info-mode.exp

@@ -84,8 +84,10 @@ test_cmd "sh" "unload $module" $ansrm
 testouterr_cmd "sh" "switch $module $module2" $anssw ""
 
 # test refresh
+setenv_var __MODULES_LMREFRESH $module
 set ansout [list refresh [shell_ok sh 1]]
 testouterr_cmd sh {refresh} [join $ansout \n] {}
+unsetenv_var __MODULES_LMREFRESH
 
 # Clean up the just changed environment
 unsetenv_loaded_module

testsuite/modules.50-cmds/084-info-mode-exp.exp

@@ -93,8 +93,10 @@ test_cmd "sh" "unload $module" $ansrm
 testouterr_cmd "sh" "switch $module $module2" $anssw ""
 
 # test refresh
+setenv_var __MODULES_LMREFRESH $module
 set ansout [list refresh nonpersist [shell_ok sh 1]]
 testouterr_cmd sh {refresh} [join $ansout \n] {}
+unsetenv_var __MODULES_LMREFRESH
 
 # Clean up the just changed environment
 unsetenv_loaded_module

testsuite/modules.50-cmds/282-info-command.exp

@@ -120,7 +120,9 @@ testouterr_cmd "sh" "unload $module" $ansun "unload"
 testouterr_cmd "sh" "switch $module $module" $ans "switch\nswitch"
 
 # test refreshing
+setenv_var __MODULES_LMREFRESH $module
 testouterr_cmd sh refresh OK refresh
+unsetenv_var __MODULES_LMREFRESH
 
 # test purging
 testouterr_cmd "sh" "purge" $ansun "purge"

testsuite/modules.50-cmds/283-info-command-exp.exp

@@ -121,7 +121,9 @@ testouterr_cmd "sh" "unload $module" $ansun "unload"
 testouterr_cmd "sh" "switch $module $module" $ans "switch\nswitch"
 
 # test refreshing
+setenv_var __MODULES_LMREFRESH $module
 testouterr_cmd sh refresh OK refresh
+unsetenv_var __MODULES_LMREFRESH
 
 # test purging
 testouterr_cmd "sh" "purge" $ansun "purge"