060-saveshow.exp (modules-5.1.1.tar.bz2) | : | 060-saveshow.exp (modules-5.2.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 23 | skipping to change at line 23 | |||
# Command: | # Command: | |||
# Modulefiles: | # Modulefiles: | |||
# Sub-Command: | # Sub-Command: | |||
# | # | |||
# Comment: %C{ | # Comment: %C{ | |||
# Test the module 'saveshow' command | # Test the module 'saveshow' command | |||
# }C% | # }C% | |||
# | # | |||
############################################################################## | ############################################################################## | |||
set cbadnerrmsg "$error_msgs: Collection $collbadn cannot be found" | set cbadnerrmsg [err_coll_notfound $collbadn] | |||
set cbadfperrmsg "$error_msgs: Collection $collbadfp cannot be found" | set cbadfperrmsg [err_coll_notfound $collbadfp] | |||
set cbadterrmsg "$error_msgs: Collection $colld (for target \"$colltarget\") can | set cbadterrmsg [err_coll_notfound $colld $colltarget] | |||
not be found" | ||||
set badcontfp "$homewithcoll/.Xresources" | set badcontfp "$homewithcoll/.Xresources" | |||
set badcontfperrmsg "$error_msgs: $badcontfp is not a valid collection" | set badcontfperrmsg [err_coll_notvalid $badcontfp] | |||
# set HOME to location containing collections | # set HOME to location containing collections | |||
if { $verbose > 0 } { | if { $verbose > 0 } { | |||
send_user "\tSetup HOME = $homewithcoll\n" | send_user "\tSetup HOME = $homewithcoll\n" | |||
} | } | |||
set env(HOME) "$homewithcoll" | set env(HOME) "$homewithcoll" | |||
# | # | |||
# test showing nonexistent collection | # test showing nonexistent collection | |||
# | # | |||
skipping to change at line 126 | skipping to change at line 126 | |||
# test displaying collection with no modulepath and modulefiles loaded as fullpa th | # test displaying collection with no modulepath and modulefiles loaded as fullpa th | |||
# | # | |||
testouterr_cmd_re "sh" "saveshow $coll7fp" "OK" "$modlin\n$coll7fpre:\n\n$c7cont re\n$modlin" | testouterr_cmd_re "sh" "saveshow $coll7fp" "OK" "$modlin\n$coll7fpre:\n\n$c7cont re\n$modlin" | |||
# | # | |||
# test showing nonexistent default collection when | # test showing nonexistent default collection when | |||
# MODULES_COLLECTION_TARGET is set | # MODULES_COLLECTION_TARGET is set | |||
# | # | |||
testouterr_cmd "ALL" "saveshow" "ERR" "$cbadterrmsg" | testouterr_cmd "ALL" "saveshow default" "ERR" "$cbadterrmsg" | |||
# no collection name specified, if default collection does not exists | ||||
# initial environment is displayed | ||||
set tserr "$modlin\ninitial environment:\n\n\n$modlin" | ||||
testouterr_cmd_re ALL saveshow OK $tserr | ||||
# same effect if __init__ name is provided | ||||
testouterr_cmd_re sh {saveshow __init__} OK $tserr | ||||
# set specific initial environment | ||||
setenv_var __MODULES_LMINIT "module use --append $c9modpath1:module load $c9mod3 | ||||
" | ||||
set tserr "$modlin | ||||
initial environment: | ||||
module use --append [escre $c9modpath1] | ||||
module load $c9mod3 | ||||
$modlin" | ||||
testouterr_cmd_re sh saveshow OK $tserr | ||||
testouterr_cmd_re sh {saveshow __init__} OK $tserr | ||||
unsetenv_var __MODULES_LMINIT | ||||
# | # | |||
# test displaying collection with no modulepath and modulefiles loaded as fullpa th | # test displaying collection with no modulepath and modulefiles loaded as fullpa th | |||
# | # | |||
unsetenv_var MODULES_COLLECTION_TARGET | unsetenv_var MODULES_COLLECTION_TARGET | |||
if {!$is_symlink_supported} { | if {!$is_symlink_supported} { | |||
send_user "\tskipping tests over '$modpath wspace' modulepath as symbolic li nks are not supported on filesystem\n" | send_user "\tskipping tests over '$modpath wspace' modulepath as symbolic li nks are not supported on filesystem\n" | |||
} else { | } else { | |||
End of changes. 3 change blocks. | ||||
6 lines changed or deleted | 28 lines changed or added |