152-module-emptyarg.exp (modules-5.1.1.tar.bz2) | : | 152-module-emptyarg.exp (modules-5.2.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 46 | skipping to change at line 46 | |||
setenv_path_var MODULEPATH $modulepath | setenv_path_var MODULEPATH $modulepath | |||
# no test of module commands that can only be called from the top level | # no test of module commands that can only be called from the top level | |||
# (command-line). these commands are already checked in 151-module-onlytop.exp | # (command-line). these commands are already checked in 151-module-onlytop.exp | |||
# | # | |||
# test load mode | # test load mode | |||
# | # | |||
# wrong arg number if command does not accept any argument | # wrong arg number if command does not accept any argument | |||
foreach cmd [list purge reload aliases savelist] { | foreach cmd [list purge reload aliases] { | |||
testouterr_cmd "sh" "load $module/$cmd" "ERR" [msg_load $module/$cmd [msg_mo derr "Unexpected number of args for '$cmd' command" "module $cmd {}" $modulepath /$module/$cmd 27]] | testouterr_cmd "sh" "load $module/$cmd" "ERR" [msg_load $module/$cmd [msg_mo derr "Unexpected number of args for '$cmd' command" "module $cmd {}" $modulepath /$module/$cmd 27]] | |||
} | } | |||
# on most module commands, empty arg leads to error | # on most module commands, empty arg leads to error | |||
# test both empty names {} and "" on same module command | # test both empty names {} and "" on same module command | |||
if {$install_autohandling eq {y}} { | ||||
testouterr_cmd "sh" "load $module/load" "ERR" [msg_load $module/load $err_emptym odname [err_reqlo {}]] | testouterr_cmd "sh" "load $module/load" "ERR" [msg_load $module/load $err_emptym odname [err_reqlo {}]] | |||
} else { | ||||
testouterr_cmd "sh" "load $module/load" "ERR" [msg_load $module/load $err_emptym | ||||
odname $err_emptymodname [err_reqlo {}]] | ||||
} | ||||
testouterr_cmd "sh" "load $module/unload" "ERR" [msg_load $module/unload $err_em ptymodname $err_emptymodname] | testouterr_cmd "sh" "load $module/unload" "ERR" [msg_load $module/unload $err_em ptymodname $err_emptymodname] | |||
testouterr_cmd "sh" "load $module/load-any" "ERR" [msg_load $module/load-any [er r_reqlo {} {}]] | testouterr_cmd "sh" "load $module/load-any" "ERR" [msg_load $module/load-any [er r_reqlo {} {}]] | |||
set ans [list] | set ans [list] | |||
lappend ans [list set __MODULES_LMPREREQ "$module/try-load&$module/try-load|"] | ||||
lappend ans [list set _LMFILES_ "$modulepath/$module/try-load"] | lappend ans [list set _LMFILES_ "$modulepath/$module/try-load"] | |||
lappend ans [list set LOADEDMODULES "$module/try-load"] | lappend ans [list set LOADEDMODULES "$module/try-load"] | |||
testouterr_cmd "sh" "load $module/try-load" $ans {} | testouterr_cmd "sh" "load $module/try-load" $ans {} | |||
# for some module commands, error is not fatal and modulefile is loaded | # for some module commands, error is not fatal and modulefile is loaded | |||
foreach cmd [list display test] { | foreach cmd [list display test] { | |||
set ans [list] | set ans [list] | |||
lappend ans [list set _LMFILES_ "$modulepath/$module/$cmd"] | lappend ans [list set _LMFILES_ "$modulepath/$module/$cmd"] | |||
lappend ans [list set LOADEDMODULES "$module/$cmd"] | lappend ans [list set LOADEDMODULES "$module/$cmd"] | |||
lappend ans [list ERR] | lappend ans [list ERR] | |||
skipping to change at line 118 | skipping to change at line 115 | |||
testouterr_cmd_re "sh" "load $module/$cmd" $ans {.+} | testouterr_cmd_re "sh" "load $module/$cmd" $ans {.+} | |||
} | } | |||
set ans [list] | set ans [list] | |||
lappend ans [list set _LMFILES_ "$modulepath/$module/avail"] | lappend ans [list set _LMFILES_ "$modulepath/$module/avail"] | |||
lappend ans [list set LOADEDMODULES "$module/avail"] | lappend ans [list set LOADEDMODULES "$module/avail"] | |||
testouterr_cmd_re "sh" "load $module/avail" $ans ".+" | testouterr_cmd_re "sh" "load $module/avail" $ans ".+" | |||
set ans [list] | set ans [list] | |||
lappend ans [list set _LMFILES_ $modulepath/$module/list] | lappend ans [list set _LMFILES_ $modulepath/$module/list] | |||
lappend ans [list set LOADEDMODULES $module/list] | lappend ans [list set LOADEDMODULES $module/list] | |||
testouterr_cmd sh "load $module/list" $ans $no_loaded | testouterr_cmd sh "load $module/list" $ans $no_loaded | |||
set ans [list] | ||||
lappend ans [list set _LMFILES_ $modulepath/$module/savelist] | ||||
lappend ans [list set LOADEDMODULES $module/savelist] | ||||
testouterr_cmd sh "load $module/savelist" $ans [msg_no_named_coll] | ||||
# | # | |||
# test unload mode | # test unload mode | |||
# | # | |||
# wrong arg number if command does not accept any argument | # wrong arg number if command does not accept any argument | |||
foreach cmd [list purge reload aliases savelist] { | foreach cmd [list purge reload aliases] { | |||
setenv_loaded_module "$module/$cmd" "$modulepath/$module/$cmd" | setenv_loaded_module "$module/$cmd" "$modulepath/$module/$cmd" | |||
testouterr_cmd "sh" "unload $module/$cmd" "ERR" [msg_unload $module/$cmd [ms g_moderr "Unexpected number of args for '$cmd' command" "module $cmd {}" $module path/$module/$cmd 27]] | testouterr_cmd "sh" "unload $module/$cmd" "ERR" [msg_unload $module/$cmd [ms g_moderr "Unexpected number of args for '$cmd' command" "module $cmd {}" $module path/$module/$cmd 27]] | |||
} | } | |||
# on most module commands, empty arg leads to error | # on most module commands, empty arg leads to error | |||
foreach cmd [list load load-any try-load unload] { | foreach cmd [list load load-any try-load unload] { | |||
setenv_loaded_module "$module/$cmd" "$modulepath/$module/$cmd" | setenv_loaded_module "$module/$cmd" "$modulepath/$module/$cmd" | |||
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] | |||
skipping to change at line 189 | skipping to change at line 190 | |||
setenv_loaded_module "$module/avail" "$modulepath/$module/avail" | setenv_loaded_module "$module/avail" "$modulepath/$module/avail" | |||
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] | |||
testouterr_cmd_re "sh" "unload $module/avail" $ans ".+" | testouterr_cmd_re "sh" "unload $module/avail" $ans ".+" | |||
setenv_loaded_module $module/list $modulepath/$module/list | setenv_loaded_module $module/list $modulepath/$module/list | |||
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] | |||
testouterr_cmd sh "unload $module/list" $ans "$cur_matchingloaded\n 1) $module/l ist " | testouterr_cmd sh "unload $module/list" $ans "$cur_matchingloaded\n 1) $module/l ist " | |||
setenv_loaded_module $module/savelist $modulepath/$module/savelist | ||||
set ans [list] | ||||
lappend ans [list unset _LMFILES_] | ||||
lappend ans [list unset LOADEDMODULES] | ||||
testouterr_cmd sh "unload $module/savelist" $ans [msg_no_named_coll] | ||||
# restore environment | # restore environment | |||
unsetenv_loaded_module | unsetenv_loaded_module | |||
# | # | |||
# test display mode | # test display mode | |||
# | # | |||
proc display_stderr_content {modfile content} { | proc display_stderr_content {modfile content} { | |||
if {$content ne ""} { | if {$content ne ""} { | |||
End of changes. 7 change blocks. | ||||
7 lines changed or deleted | 12 lines changed or added |