540-complete.exp (modules-5.1.1.tar.bz2) | : | 540-complete.exp (modules-5.2.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 43 | skipping to change at line 43 | |||
# bad specifications | # bad specifications | |||
# | # | |||
setenv_var TESTSUITE_COMPLETE compbad1 | setenv_var TESTSUITE_COMPLETE compbad1 | |||
# load | # load | |||
set tserr [escre [msg_load $mod [msg_moderr {wrong # args: should be "complete s hell name body"} {complete<EXM>} $modfile 5 {} {} {} {} {invoked from within}]]] | set tserr [escre [msg_load $mod [msg_moderr {wrong # args: should be "complete s hell name body"} {complete<EXM>} $modfile 5 {} {} {} {} {invoked from within}]]] | |||
testouterr_cmd_re bash "load $mod" ERR $tserr | testouterr_cmd_re bash "load $mod" ERR $tserr | |||
setenv_loaded_module [list $mod] [list $modfile] | setenv_loaded_module [list $mod] [list $modfile] | |||
setenv_var __MODULES_LMREFRESH $mod | ||||
# unload | # unload | |||
set tserr [escre [msg_unload $mod [msg_moderr {wrong # args: should be "complete shell name body"} {complete<EXM>} $modfile 5 {} {} {} {} {invoked from within}] ]] | set tserr [escre [msg_unload $mod [msg_moderr {wrong # args: should be "complete shell name body"} {complete<EXM>} $modfile 5 {} {} {} {} {invoked from within}] ]] | |||
testouterr_cmd_re bash "unload $mod" ERR $tserr | testouterr_cmd_re bash "unload $mod" ERR $tserr | |||
# refresh | # refresh | |||
set tserr [escre [msg_refresh $mod [msg_moderr {wrong # args: should be "complet e shell name body"} {complete<EXM>} $modfile 5 {} {} {} {} {invoked from within} ]]] | set tserr [escre [msg_refresh $mod [msg_moderr {wrong # args: should be "complet e shell name body"} {complete<EXM>} $modfile 5 {} {} {} {} {invoked from within} ]]] | |||
testouterr_cmd_re bash "refresh" ERR $tserr | testouterr_cmd_re bash "refresh" ERR $tserr | |||
unsetenv_loaded_module | unsetenv_loaded_module | |||
unsetenv_var __MODULES_LMREFRESH | ||||
# whatis | # whatis | |||
set tserr "$modlin $mpre $modlin | set tserr "$modlin $mpre $modlin | |||
\\s*$mod: $mod" | \\s*$mod: $mod" | |||
testouterr_cmd_re bash "whatis $mod" OK $tserr | testouterr_cmd_re bash "whatis $mod" OK $tserr | |||
# display | # display | |||
set tserr "$modlin | set tserr "$modlin | |||
$mpre/$mod: | $mpre/$mod: | |||
skipping to change at line 120 | skipping to change at line 122 | |||
# | # | |||
# regular specifications | # regular specifications | |||
# | # | |||
setenv_var TESTSUITE_COMPLETE comp1 | setenv_var TESTSUITE_COMPLETE comp1 | |||
# load | # load | |||
foreach shell $supported_shells { | foreach shell $supported_shells { | |||
set ans [list] | set ans [list] | |||
lappend ans [list set __MODULES_LMREFRESH $mod] | ||||
lappend ans [list set _LMFILES_ $modfile] | lappend ans [list set _LMFILES_ $modfile] | |||
lappend ans [list set LOADEDMODULES $mod] | lappend ans [list set LOADEDMODULES $mod] | |||
switch -- $shell { | switch -- $shell { | |||
bash { | bash { | |||
lappend ans [list out {complete -o default -F _cmd cmd;}] | lappend ans [list out {complete -o default -F _cmd cmd;}] | |||
} | } | |||
tcsh { | tcsh { | |||
lappend ans [list out {complete cmd some arg list for tcsh;}] | lappend ans [list out {complete cmd some arg list for tcsh;}] | |||
} | } | |||
fish { | fish { | |||
lappend ans [list out {complete -e -c cmd;}] | lappend ans [list out {complete -e -c cmd;}] | |||
lappend ans [list out {complete -c cmd some arg list for fish;}] | lappend ans [list out {complete -c cmd some arg list for fish;}] | |||
lappend ans [list out {complete -c cmd other arg list for fish;}] | lappend ans [list out {complete -c cmd other arg list for fish;}] | |||
} | } | |||
} | } | |||
testouterr_cmd $shell "load $mod" $ans {} | testouterr_cmd $shell "load $mod" $ans {} | |||
} | } | |||
setenv_loaded_module [list $mod] [list $modfile] | setenv_loaded_module [list $mod] [list $modfile] | |||
setenv_var __MODULES_LMREFRESH $mod | ||||
# unload | # unload | |||
foreach shell $supported_shells { | foreach shell $supported_shells { | |||
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] | |||
lappend ans [list unset __MODULES_LMREFRESH] | ||||
switch -- $shell { | switch -- $shell { | |||
bash { | bash { | |||
lappend ans [list out {complete -r cmd;}] | lappend ans [list out {complete -r cmd;}] | |||
} | } | |||
tcsh { | tcsh { | |||
lappend ans [list out {uncomplete cmd;}] | lappend ans [list out {uncomplete cmd;}] | |||
} | } | |||
fish { | fish { | |||
lappend ans [list out {complete -e -c cmd;}] | lappend ans [list out {complete -e -c cmd;}] | |||
} | } | |||
skipping to change at line 184 | skipping to change at line 189 | |||
lappend ans [list out {complete -c cmd other arg list for fish;}] | lappend ans [list out {complete -c cmd other arg list for fish;}] | |||
} | } | |||
default { | default { | |||
set ans [list [list OK nop]] | set ans [list [list OK nop]] | |||
} | } | |||
} | } | |||
testouterr_cmd $shell "refresh" $ans {} | testouterr_cmd $shell "refresh" $ans {} | |||
} | } | |||
unsetenv_loaded_module | unsetenv_loaded_module | |||
unsetenv_var __MODULES_LMREFRESH | ||||
# whatis | # whatis | |||
set tserr "$modlin $mpre $modlin | set tserr "$modlin $mpre $modlin | |||
\\s*$mod: $mod" | \\s*$mod: $mod" | |||
testouterr_cmd_re bash "whatis $mod" OK $tserr | testouterr_cmd_re bash "whatis $mod" OK $tserr | |||
testouterr_cmd_re sh "whatis $mod" OK $tserr | testouterr_cmd_re sh "whatis $mod" OK $tserr | |||
# display | # display | |||
set tserr "$modlin | set tserr "$modlin | |||
$mpre/$mod: | $mpre/$mod: | |||
skipping to change at line 227 | skipping to change at line 233 | |||
Module Specific Test for $mpre/$mod: | Module Specific Test for $mpre/$mod: | |||
$warn_msgs: Unable to find ModulesTest in $modfilere. | $warn_msgs: Unable to find ModulesTest in $modfilere. | |||
$modlin" | $modlin" | |||
testouterr_cmd_re bash "test $mod" OK $tserr | testouterr_cmd_re bash "test $mod" OK $tserr | |||
testouterr_cmd_re sh "test $mod" OK $tserr | testouterr_cmd_re sh "test $mod" OK $tserr | |||
setenv_var TESTSUITE_COMPLETE comp2 | setenv_var TESTSUITE_COMPLETE comp2 | |||
foreach shell $supported_shells { | foreach shell $supported_shells { | |||
set ans [list] | set ans [list] | |||
lappend ans [list set __MODULES_LMREFRESH $mod] | ||||
lappend ans [list set _LMFILES_ $modfile] | lappend ans [list set _LMFILES_ $modfile] | |||
lappend ans [list set LOADEDMODULES $mod] | lappend ans [list set LOADEDMODULES $mod] | |||
switch -- $shell { | switch -- $shell { | |||
bash { | bash { | |||
lappend ans [list out {complete some arg list for shell cmd;}] | lappend ans [list out {complete some arg list for shell cmd;}] | |||
lappend ans [list out {complete other arg list for shell cmd;}] | lappend ans [list out {complete other arg list for shell cmd;}] | |||
} | } | |||
tcsh { | tcsh { | |||
lappend ans [list out {complete cmd some arg list for shell;}] | lappend ans [list out {complete cmd some arg list for shell;}] | |||
lappend ans [list out {complete cmd other arg list for shell;}] | lappend ans [list out {complete cmd other arg list for shell;}] | |||
skipping to change at line 253 | skipping to change at line 260 | |||
} | } | |||
testouterr_cmd $shell "load $mod" $ans {} | testouterr_cmd $shell "load $mod" $ans {} | |||
} | } | |||
# | # | |||
# break/restore evaluations | # break/restore evaluations | |||
# | # | |||
setenv_var TESTSUITE_COMPLETE compbreak1 | setenv_var TESTSUITE_COMPLETE compbreak1 | |||
set ans [list] | set ans [list] | |||
lappend ans [list set __MODULES_LMREFRESH $modname/1.2] | ||||
lappend ans [list set _LMFILES_ $mp/$modname/1.2] | lappend ans [list set _LMFILES_ $mp/$modname/1.2] | |||
lappend ans [list set LOADEDMODULES $modname/1.2] | lappend ans [list set LOADEDMODULES $modname/1.2] | |||
lappend ans [list out {complete -o default -F _othercmd othercmd;}] | lappend ans [list out {complete -o default -F _othercmd othercmd;}] | |||
lappend ans [list ERR] | lappend ans [list ERR] | |||
set tserr [msg_load $mod $err_evalabort] | set tserr [msg_load $mod $err_evalabort] | |||
testouterr_cmd_re bash "load $mod $modname/1.2" $ans $tserr | testouterr_cmd_re bash "load $mod $modname/1.2" $ans $tserr | |||
setenv_var TESTSUITE_COMPLETE compbreak2 | setenv_var TESTSUITE_COMPLETE compbreak2 | |||
set ans [list] | set ans [list] | |||
lappend ans [list set _LMFILES_ $mp/$modname/1.2] | lappend ans [list set _LMFILES_ $mp/$modname/1.2] | |||
skipping to change at line 274 | skipping to change at line 282 | |||
lappend ans [list ERR] | lappend ans [list ERR] | |||
set tserr [msg_load $mod $err_evalabort] | set tserr [msg_load $mod $err_evalabort] | |||
testouterr_cmd_re bash "load $mod $modname/1.2" $ans $tserr | testouterr_cmd_re bash "load $mod $modname/1.2" $ans $tserr | |||
# | # | |||
# combined evaluations | # combined evaluations | |||
# | # | |||
setenv_var TESTSUITE_COMPLETE compcomb1 | setenv_var TESTSUITE_COMPLETE compcomb1 | |||
set ans [list] | set ans [list] | |||
lappend ans [list set __MODULES_LMREFRESH $mod] | ||||
lappend ans [list set _LMFILES_ $modfile:$mp/$modname/1.2] | lappend ans [list set _LMFILES_ $modfile:$mp/$modname/1.2] | |||
lappend ans [list set LOADEDMODULES $mod:$modname/1.2] | lappend ans [list set LOADEDMODULES $mod:$modname/1.2] | |||
lappend ans [list out {complete -r cmd;}] | lappend ans [list out {complete -r cmd;}] | |||
testouterr_cmd_re bash "load $mod $modname/1.2" $ans {} | testouterr_cmd_re bash "load $mod $modname/1.2" $ans {} | |||
# | # | |||
# usage attempt from modulerc | # usage attempt from modulerc | |||
# | # | |||
setenv_var TESTSUITE_COMPLETE comprc1 | setenv_var TESTSUITE_COMPLETE comprc1 | |||
End of changes. 9 change blocks. | ||||
0 lines changed or deleted | 9 lines changed or added |