350-allin.exp (modules-5.1.1.tar.bz2) | : | 350-allin.exp (modules-5.2.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 117 | skipping to change at line 117 | |||
lappend ans [list set ts3 ok] | lappend ans [list set ts3 ok] | |||
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 $testsuitedirre] | lappend ans [list chdir $testsuitedirre] | |||
lappend ans [list set __MODULES_LMPREREQ $module/1&$module/5] | lappend ans [list set __MODULES_LMPREREQ $module/1&$module/5] | |||
lappend ans [list set LOADEDMODULES $module/5:$module/1] | lappend ans [list set LOADEDMODULES $module/5:$module/1] | |||
lappend ans [list set _LMFILES_ $modulepath/$module/5:$modulepath/$module/1] | lappend ans [list set _LMFILES_ $modulepath/$module/5:$modulepath/$module/1] | |||
lappend ans [list set __MODULES_LMTAG $module/5&auto-loaded] | lappend ans [list set __MODULES_LMTAG $module/5&auto-loaded] | |||
lappend ans [list set MODULEPATH $modulepath] | lappend ans [list set MODULEPATH $modulepath] | |||
lappend ans [list set __MODULES_LMREFRESH $module/1] | ||||
lappend ans [list set __MODULES_LMCONFLICT $module/1&$module/4] | lappend ans [list set __MODULES_LMCONFLICT $module/1&$module/4] | |||
set tserr1 "$modulepathre: | set tserr1 "$modulepathre: | |||
$module/1 | $module/1 | |||
$module/2 | $module/2 | |||
$module/3 | $module/3 | |||
$module/4 | $module/4 | |||
$module/5 | $module/5 | |||
$modlin | $modlin | |||
$modulepathre/$module/5: | $modulepathre/$module/5: | |||
setenv\t\tts3 ok | setenv\t\tts3 ok | |||
$modlin | $modlin | |||
$no_loaded | $no_loaded | |||
Named collection list: | [msg_named_coll] | |||
default | default | |||
$modlin | $modlin | |||
$collpathre/default: | $collpathre/default: | |||
module use --append $modulepathre | module use --append $modulepathre | |||
$modlin | $modlin | |||
[test_stderr_content $modulepathre/$module/5 {} 0] | [test_stderr_content $modulepathre/$module/5 {} 0] | |||
foo" | foo" | |||
skipping to change at line 171 | skipping to change at line 172 | |||
unsetenv_loaded_module | unsetenv_loaded_module | |||
testouterr_cmd_re "sh" "load $module/3" "ERR" "$whatis\n\n$whatis\n\n[msg_load $ module/3 $err_evalabort]" | testouterr_cmd_re "sh" "load $module/3" "ERR" "$whatis\n\n$whatis\n\n[msg_load $ module/3 $err_evalabort]" | |||
testouterr_cmd "sh" "load $module/4" "ERR" [msg_load $module/4 $err_evalabort] | testouterr_cmd "sh" "load $module/4" "ERR" [msg_load $module/4 $err_evalabort] | |||
# | # | |||
# test unload mode | # test unload mode | |||
# | # | |||
setenv_loaded_module [list $module/5 $module/1] [list $modulepath/$module/5 $mod ulepath/$module/1] [list $module/5] | setenv_loaded_module [list $module/5 $module/1] [list $modulepath/$module/5 $mod ulepath/$module/1] [list $module/5] | |||
setenv_var __MODULES_LMREFRESH $module/1 | ||||
setenv_var __MODULES_LMALTNAME $module/1&foo | setenv_var __MODULES_LMALTNAME $module/1&foo | |||
setenv_var __MODULES_LMPREREQ $module/1&$module/5 | setenv_var __MODULES_LMPREREQ $module/1&$module/5 | |||
setenv_var __MODULES_LMCONFLICT $module/1&$module/4 | setenv_var __MODULES_LMCONFLICT $module/1&$module/4 | |||
setenv_var ts1 "ok" | setenv_var ts1 "ok" | |||
setenv_var tsu "" | setenv_var tsu "" | |||
setenv_var TSPATH "dir3 dir2" | setenv_var TSPATH "dir3 dir2" | |||
unsetenv_var __MODULES_SHARE_TSPATH | unsetenv_var __MODULES_SHARE_TSPATH | |||
setenv_var tsp "dir3 dir2" | setenv_var tsp "dir3 dir2" | |||
set ans [list] | set ans [list] | |||
lappend ans [list unset ts1] | lappend ans [list unset ts1] | |||
lappend ans [list unset tsc] | lappend ans [list unset tsc] | |||
lappend ans [list unset tsu] | lappend ans [list unset tsu] | |||
lappend ans [list unset TSPATH] | lappend ans [list unset TSPATH] | |||
lappend ans [list unset tsp] | lappend ans [list unset tsp] | |||
lappend ans [list set ts2 ok] | lappend ans [list set ts2 ok] | |||
lappend ans [list set MODULEPATH $modulepath] | lappend ans [list set MODULEPATH $modulepath] | |||
lappend ans [list unset __MODULES_LMREFRESH] | ||||
lappend ans [list unset ts3] | lappend ans [list unset ts3] | |||
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 unset __MODULES_LMPREREQ] | lappend ans [list unset __MODULES_LMPREREQ] | |||
lappend ans [list unset LOADEDMODULES] | lappend ans [list unset LOADEDMODULES] | |||
lappend ans [list unset _LMFILES_] | lappend ans [list unset _LMFILES_] | |||
lappend ans [list unset __MODULES_LMCONFLICT] | lappend ans [list unset __MODULES_LMCONFLICT] | |||
lappend ans [list unset __MODULES_LMALTNAME] | lappend ans [list unset __MODULES_LMALTNAME] | |||
lappend ans [list unset __MODULES_LMTAG] | lappend ans [list unset __MODULES_LMTAG] | |||
set tserr1 "$modulepathre: | set tserr1 "$modulepathre: | |||
skipping to change at line 212 | skipping to change at line 215 | |||
$modlin | $modlin | |||
$modulepathre/$module/5: | $modulepathre/$module/5: | |||
setenv\t\tts3 ok | setenv\t\tts3 ok | |||
$modlin | $modlin | |||
$cur_loaded | $cur_loaded | |||
$module/5 | $module/5 | |||
$module/1 | $module/1 | |||
Named collection list: | [msg_named_coll] | |||
default | default | |||
$modlin | $modlin | |||
$collpathre/default: | $collpathre/default: | |||
module use --append $modulepathre | module use --append $modulepathre | |||
module load --tag=auto-loaded $module[if_implicitdefault {} /5] | module load --tag=auto-loaded $module[if_implicitdefault {} /5] | |||
module load $module/1 | module load $module/1 | |||
$modlin | $modlin | |||
skipping to change at line 238 | skipping to change at line 241 | |||
} else { | } else { | |||
testouterr_cmd_re "sh" "unload $module/1" $ans $tserr1\n\n[msg_top_unload $m odule/1 {} $module/5 {} "WARNING: Unable to find ModulesTest in $modulepathre/$m odule/5."] | testouterr_cmd_re "sh" "unload $module/1" $ans $tserr1\n\n[msg_top_unload $m odule/1 {} $module/5 {} "WARNING: Unable to find ModulesTest in $modulepathre/$m odule/5."] | |||
} | } | |||
# restore environment | # restore environment | |||
unsetenv_var ts1 | unsetenv_var ts1 | |||
unsetenv_var tsu | unsetenv_var tsu | |||
unsetenv_path_var TSPATH | unsetenv_path_var TSPATH | |||
unsetenv_var tsp | unsetenv_var tsp | |||
unsetenv_var __MODULES_LMREFRESH | ||||
unsetenv_var __MODULES_LMALTNAME | unsetenv_var __MODULES_LMALTNAME | |||
unsetenv_var __MODULES_LMPREREQ | unsetenv_var __MODULES_LMPREREQ | |||
unsetenv_var __MODULES_LMCONFLICT | unsetenv_var __MODULES_LMCONFLICT | |||
setenv_loaded_module "$module/2" "$modulepath/$module/2" | setenv_loaded_module "$module/2" "$modulepath/$module/2" | |||
set ans [list] | set ans [list] | |||
lappend ans [list unset _LMFILES_] | lappend ans [list unset _LMFILES_] | |||
lappend ans [list unset LOADEDMODULES] | lappend ans [list unset LOADEDMODULES] | |||
set tserr "100[if_implicitdefault 1 0]Tclunloadunload$module/2$module/2shsh$modu le$module/2$u_sysnamere$u_nodenamere$u_domainre$u_releasere$u_versionre$u_machin ere" | set tserr "100[if_implicitdefault 1 0]Tclunloadunload$module/2$module/2shsh$modu le$module/2$u_sysnamere$u_nodenamere$u_domainre$u_releasere$u_versionre$u_machin ere" | |||
End of changes. 6 change blocks. | ||||
2 lines changed or deleted | 6 lines changed or added |