020-savelist.exp (modules-5.1.1.tar.bz2) | : | 020-savelist.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 'savelist' command | # Test the module 'savelist' command | |||
# }C% | # }C% | |||
# | # | |||
############################################################################## | ############################################################################## | |||
set header_long "- Collection $modlin.- Last mod. $modlin" | set header_no_coll [msg_no_named_coll] | |||
set header_no_coll "No named collection." | set header_target_no_coll [msg_no_named_coll 0 $collemptytarget] | |||
set header_target_no_coll "No named collection (for target \"$collemptytarget\") | set header_coll [msg_named_coll] | |||
." | set header_target_coll [msg_named_coll 0 $colltarget] | |||
set header_coll "Named collection list:" | set header_target_coll_re [escre $header_target_coll] | |||
set header_target_coll "Named collection list (for target \"$colltarget\"):" | ||||
set header_target_coll_re "Named collection list \\(for target \"$colltarget\"\\ | ||||
):" | ||||
set coll_list "$coll1\n$coll2\n$coll3\n$coll4f\n$coll6f\n$colld\ninfocmd\ninfocm dexp" | set coll_list "$coll1\n$coll2\n$coll3\n$coll4f\n$coll6f\n$colld\ninfocmd\ninfocm dexp" | |||
set coll_list_idx " 1) $coll1 3) $coll3 5) $coll6f 7) infocmd \ n 2) $coll2 4) $coll4f 6) $colld 8) infocmdexp " | set coll_list_idx " 1) $coll1 3) $coll3 5) $coll6f 7) infocmd \ n 2) $coll2 4) $coll4f 6) $colld 8) infocmdexp " | |||
set lprops "\\s+\[0-9\/]{10} \[0-9:]{8}" | set lprops "\\s+\[0-9\/]{10} \[0-9:]{8}" | |||
set coll_list_long "$coll1$lprops\n$coll2$lprops\n$coll3$lprops\n$coll4f$lprops\ n$coll6f$lprops\n$colld$lprops\ninfocmd$lprops\ninfocmdexp$lprops" | set coll_list_long "$coll1$lprops\n$coll2$lprops\n$coll3$lprops\n$coll4f$lprops\ n$coll6f$lprops\n$colld$lprops\ninfocmd$lprops\ninfocmdexp$lprops" | |||
set coll_target_list "$coll4\n$coll6" | set coll_target_list "$coll4\n$coll6" | |||
set coll_target_list_idx " 1) $coll4 2) $coll6 " | set coll_target_list_idx " 1) $coll4 2) $coll6 " | |||
set coll_target_list_long "$coll4$lprops\n$coll6$lprops" | set coll_target_list_long "$coll4$lprops\n$coll6$lprops" | |||
# | # | |||
# test HOME with no collection | # test HOME with no collection | |||
skipping to change at line 67 | skipping to change at line 66 | |||
if {![info exists term_cols]} { | if {![info exists term_cols]} { | |||
# skip tests if current terminal width is unknown | # skip tests if current terminal width is unknown | |||
send_user "\tskipping terminal width-specific tests\n" | send_user "\tskipping terminal width-specific tests\n" | |||
} elseif {[catch {exec stty cols 80}] || [getTtyCols] ne 80} { | } elseif {[catch {exec stty cols 80}] || [getTtyCols] ne 80} { | |||
send_user "\tskipping terminal width-specific tests, cannot set width\n" | send_user "\tskipping terminal width-specific tests, cannot set width\n" | |||
} else { | } else { | |||
testouterr_cmd "sh" "savelist --terse" "OK" "$header_coll\n$coll_list" | testouterr_cmd "sh" "savelist --terse" "OK" "$header_coll\n$coll_list" | |||
testouterr_cmd "sh" "savelist -l --terse" "OK" "$header_coll\n$coll_list" | testouterr_cmd "sh" "savelist -l --terse" "OK" "$header_coll\n$coll_list" | |||
testouterr_cmd "sh" "savelist" "OK" "$header_coll\n$coll_list_idx" | testouterr_cmd "sh" "savelist" "OK" "$header_coll\n$coll_list_idx" | |||
testouterr_cmd_re "sh" "savelist --long" "OK" "$header_long\n$header_coll\n$coll | testouterr_cmd_re "sh" "savelist --long" "OK" "$savelist_long_headerre\n$header_ | |||
_list_long" | coll\n$coll_list_long" | |||
testouterr_cmd_re "sh" "savelist -t --long" "OK" "$header_long\n$header_coll\n$c | testouterr_cmd_re "sh" "savelist -t --long" "OK" "$savelist_long_headerre\n$head | |||
oll_list_long" | er_coll\n$coll_list_long" | |||
# test effect of mcookie configuration | # test effect of mcookie configuration | |||
setenv_var MODULES_MCOOKIE_CHECK eval | setenv_var MODULES_MCOOKIE_CHECK eval | |||
testouterr_cmd sh "savelist --terse" OK "$header_coll\n$coll_list" | testouterr_cmd sh "savelist --terse" OK "$header_coll\n$coll_list" | |||
setenv_var MODULES_MCOOKIE_CHECK always | setenv_var MODULES_MCOOKIE_CHECK always | |||
setenv_var MODULES_MCOOKIE_VERSION_CHECK 0 | setenv_var MODULES_MCOOKIE_VERSION_CHECK 0 | |||
testouterr_cmd sh "savelist --terse" OK "$header_coll\n$coll_list" | testouterr_cmd sh "savelist --terse" OK "$header_coll\n$coll_list" | |||
setenv_var MODULES_MCOOKIE_VERSION_CHECK 1 | setenv_var MODULES_MCOOKIE_VERSION_CHECK 1 | |||
skipping to change at line 112 | skipping to change at line 111 | |||
# | # | |||
if { $verbose > 0 } { | if { $verbose > 0 } { | |||
send_user "\tSetup MODULES_COLLECTION_TARGET = $colltarget\n" | send_user "\tSetup MODULES_COLLECTION_TARGET = $colltarget\n" | |||
} | } | |||
set env(MODULES_COLLECTION_TARGET) "$colltarget" | set env(MODULES_COLLECTION_TARGET) "$colltarget" | |||
# target has matching collection | # target has matching collection | |||
testouterr_cmd "sh" "savelist -t" "OK" "$header_target_coll\n$coll_target_list" | testouterr_cmd "sh" "savelist -t" "OK" "$header_target_coll\n$coll_target_list" | |||
testouterr_cmd "sh" "savelist" "OK" "$header_target_coll\n$coll_target_list_idx" | testouterr_cmd "sh" "savelist" "OK" "$header_target_coll\n$coll_target_list_idx" | |||
testouterr_cmd_re "sh" "savelist -l" "OK" "$header_long\n$header_target_coll_re\ n$coll_target_list_long" | testouterr_cmd_re "sh" "savelist -l" "OK" "$savelist_long_headerre\n$header_targ et_coll_re\n$coll_target_list_long" | |||
# | # | |||
# test unsetting HOME | # test unsetting HOME | |||
# | # | |||
if { $verbose > 0 } { | if { $verbose > 0 } { | |||
send_user "\tUnset HOME \n" | send_user "\tUnset HOME \n" | |||
} | } | |||
unset env(HOME) | unset env(HOME) | |||
End of changes. 3 change blocks. | ||||
13 lines changed or deleted | 10 lines changed or added |