Skip to content

Commit 1cdd5d3

Browse files
xdelaruellexdelaruelle
committed
ts: add helper procs for collection list header msgs
1 parent 15591e5 commit 1cdd5d3

File tree

8 files changed

+67
-43
lines changed

8 files changed

+67
-43
lines changed

‎testsuite/modules.00-init/005-init_ts.exp‎

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ set no_loaded {No Modulefiles Currently Loaded.}
5353
set no_matchingloaded {No Matching Modulefiles Currently Loaded.}
5454
set cur_loaded {Currently Loaded Modulefiles:}
5555
set cur_matchingloaded {Currently Loaded Matching Modulefiles:}
56-
set no_named_coll {No named collection.}
57-
set no_matching_named_coll {No matching named collection.}
58-
set named_coll {Named collection list:}
59-
set matching_named_coll {Matching named collection list:}
6056
set msg_invcmdname {invalid command name}
6157
set msg_patheqsep {cannot handle path equals to separator string}
6258
set msg_needenvvarname {should get an environment variable name}
@@ -360,7 +356,36 @@ proc err_stash_name {name} {
360356
return "$::error_msgs: Invalid stash collection name '$name'"
361357
}
362358

359+
proc msg_named_coll {{matching 0} {target {}}} {
360+
if {$matching} {
361+
set msg {Matching named }
362+
} else {
363+
set msg {Named }
364+
}
365+
append msg {collection list}
366+
if {$target ne {}} {
367+
append msg " (for target \"$target\")"
368+
}
369+
append msg :
370+
return $msg
371+
}
372+
373+
proc msg_no_named_coll {{matching 0} {target {}}} {
374+
if {$matching} {
375+
set msg {No matching }
376+
} else {
377+
set msg {No }
378+
}
379+
append msg {named collection}
380+
if {$target ne {}} {
381+
append msg " (for target \"$target\")"
382+
}
383+
append msg .
384+
return $msg
385+
}
386+
363387
proc msg_moderr {msg cmdline modfile linenum {pad {}} {procname {}} {contact {}} {custom {}} {custom2 {while executing}}} {
388+
364389
set linefile [expr {$procname ne {} || $linenum eq {} ? {} : " line $linenum"}]
365390
set errcontact [expr {$contact eq {} ? $::err_contactns : "Please contact <$contact>"}]
366391
set res "$::moderr_msgs: $msg

‎testsuite/modules.50-cmds/152-module-emptyarg.exp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ testouterr_cmd sh "load $module/list" $ans $no_loaded
115115
set ans [list]
116116
lappend ans [list set _LMFILES_ $modulepath/$module/savelist]
117117
lappend ans [list set LOADEDMODULES $module/savelist]
118-
testouterr_cmd sh "load $module/savelist" $ans $no_named_coll
118+
testouterr_cmd sh "load $module/savelist" $ans [msg_no_named_coll]
119119

120120

121121
#
@@ -192,7 +192,7 @@ setenv_loaded_module $module/savelist $modulepath/$module/savelist
192192
set ans [list]
193193
lappend ans [list unset _LMFILES_]
194194
lappend ans [list unset LOADEDMODULES]
195-
testouterr_cmd sh "unload $module/savelist" $ans $no_named_coll
195+
testouterr_cmd sh "unload $module/savelist" $ans [msg_no_named_coll]
196196

197197
# restore environment
198198
unsetenv_loaded_module

‎testsuite/modules.50-cmds/350-allin.exp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ $modulepathre/$module/5:
129129
setenv\t\tts3 ok
130130
$modlin
131131
$no_loaded
132-
$named_coll
132+
[msg_named_coll]
133133
default
134134

135135
$modlin
@@ -212,7 +212,7 @@ $cur_loaded
212212
$module/5
213213
$module/1
214214

215-
$named_coll
215+
[msg_named_coll]
216216
default
217217

218218
$modlin

‎testsuite/modules.61-coll/020-savelist.exp‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@
2020
#
2121
##############################################################################
2222

23-
set header_long "- Collection $modlin.- Last mod. $modlin"
24-
set header_no_coll $no_named_coll
25-
set header_target_no_coll "No named collection (for target \"$collemptytarget\")."
26-
set header_coll $named_coll
27-
set header_target_coll "Named collection list (for target \"$colltarget\"):"
28-
set header_target_coll_re "Named collection list \\(for target \"$colltarget\"\\):"
23+
set header_no_coll [msg_no_named_coll]
24+
set header_target_no_coll [msg_no_named_coll 0 $collemptytarget]
25+
set header_coll [msg_named_coll]
26+
set header_target_coll [msg_named_coll 0 $colltarget]
27+
set header_target_coll_re [escre $header_target_coll]
2928
set coll_list "$coll1\n$coll2\n$coll3\n$coll4f\n$coll6f\n$colld\ninfocmd\ninfocmdexp"
3029
set coll_list_idx " 1) $coll1 3) $coll3 5) $coll6f 7) infocmd \n 2) $coll2 4) $coll4f 6) $colld 8) infocmdexp "
3130
set lprops "\\s+\[0-9\/]{10} \[0-9:]{8}"
@@ -66,8 +65,8 @@ if {![info exists term_cols]} {
6665
testouterr_cmd "sh" "savelist --terse" "OK" "$header_coll\n$coll_list"
6766
testouterr_cmd "sh" "savelist -l --terse" "OK" "$header_coll\n$coll_list"
6867
testouterr_cmd "sh" "savelist" "OK" "$header_coll\n$coll_list_idx"
69-
testouterr_cmd_re "sh" "savelist --long" "OK" "$header_long\n$header_coll\n$coll_list_long"
70-
testouterr_cmd_re "sh" "savelist -t --long" "OK" "$header_long\n$header_coll\n$coll_list_long"
68+
testouterr_cmd_re "sh" "savelist --long" "OK" "$savelist_long_headerre\n$header_coll\n$coll_list_long"
69+
testouterr_cmd_re "sh" "savelist -t --long" "OK" "$savelist_long_headerre\n$header_coll\n$coll_list_long"
7170

7271
# test effect of mcookie configuration
7372
setenv_var MODULES_MCOOKIE_CHECK eval
@@ -112,7 +111,7 @@ set env(MODULES_COLLECTION_TARGET) "$colltarget"
112111
# target has matching collection
113112
testouterr_cmd "sh" "savelist -t" "OK" "$header_target_coll\n$coll_target_list"
114113
testouterr_cmd "sh" "savelist" "OK" "$header_target_coll\n$coll_target_list_idx"
115-
testouterr_cmd_re "sh" "savelist -l" "OK" "$header_long\n$header_target_coll_re\n$coll_target_list_long"
114+
testouterr_cmd_re "sh" "savelist -l" "OK" "$savelist_long_headerre\n$header_target_coll_re\n$coll_target_list_long"
116115

117116

118117
#

‎testsuite/modules.61-coll/021-savelist-search.exp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@
2222

2323

2424
# test HOME with no collection
25-
set tserr $no_named_coll
25+
set tserr [msg_no_named_coll]
2626
testouterr_cmd sh {savelist foo} OK $tserr
2727

2828

2929
# set HOME to location containing collections
3030
setenv_var HOME $homewithcoll
3131

32-
set tserr "$matching_named_coll\n 1) infocmd 2) infocmdexp "
32+
set tserr "[msg_named_coll 1]\n 1) infocmd 2) infocmdexp "
3333
testouterr_cmd sh {savelist infocmd} OK $tserr
3434

35-
set tserr $no_matching_named_coll
35+
set tserr [msg_no_named_coll 1]
3636
testouterr_cmd sh {savelist bar} OK $tserr
3737

38-
set tserr "$matching_named_coll\n 1) coll1 2) infocmdexp "
38+
set tserr "[msg_named_coll 1]\n 1) coll1 2) infocmdexp "
3939
testouterr_cmd sh {savelist infocmde coll1} OK $tserr
4040
testouterr_cmd sh {savelist infocmde bar coll1} OK $tserr
4141

@@ -45,14 +45,14 @@ skip_if_quick_mode
4545
# search match & icase tests
4646
setenv_var MODULES_SEARCH_MATCH starts_with
4747

48-
set tserr "$matching_named_coll\n 1) infocmd 2) infocmdexp "
48+
set tserr "[msg_named_coll 1]\n 1) infocmd 2) infocmdexp "
4949
testouterr_cmd sh {savelist inf} OK $tserr
5050
testouterr_cmd sh {savelist -S info} OK $tserr
5151

5252
if {$install_icase eq {search}} {
5353
testouterr_cmd sh {savelist iNf} OK $tserr
5454
} else {
55-
testouterr_cmd sh {savelist iNf} OK $no_matching_named_coll
55+
testouterr_cmd sh {savelist iNf} OK [msg_no_named_coll 1]
5656
}
5757
testouterr_cmd sh {savelist -i iNf} OK $tserr
5858
testouterr_cmd sh {savelist --icase InFO} OK $tserr
@@ -61,71 +61,71 @@ testouterr_cmd sh {-i savelist infoCMD} OK $tserr
6161
testouterr_cmd sh {savelist -C cmd} OK $tserr
6262
testouterr_cmd sh {savelist --contains -i cMd} OK $tserr
6363

64-
set tserr $no_matching_named_coll
64+
set tserr [msg_no_named_coll 1]
6565
testouterr_cmd sh {savelist cmd} OK $tserr
6666
testouterr_cmd sh {savelist -i cMd} OK $tserr
6767

6868
setenv_var MODULES_SEARCH_MATCH contains
6969

70-
set tserr "$matching_named_coll\n 1) infocmd 2) infocmdexp "
70+
set tserr "[msg_named_coll 1]\n 1) infocmd 2) infocmdexp "
7171
testouterr_cmd sh {savelist info} OK $tserr
7272
testouterr_cmd sh {savelist -i info} OK $tserr
7373
testouterr_cmd sh {savelist ocm} OK $tserr
7474
testouterr_cmd sh {savelist -C cmd} OK $tserr
7575

76-
set tserr $no_matching_named_coll
76+
set tserr [msg_no_named_coll 1]
7777
testouterr_cmd sh {savelist -S cmd} OK $tserr
7878
testouterr_cmd sh {savelist --starts-with -i cMd} OK $tserr
7979

8080
unsetenv_var MODULES_SEARCH_MATCH
8181

8282
# --all tests
83-
set tserr "$matching_named_coll\n 1) infocmd 2) infocmdexp "
83+
set tserr "[msg_named_coll 1]\n 1) infocmd 2) infocmdexp "
8484
testouterr_cmd sh {savelist -a info} OK $tserr
8585
setenv_var MODULES_COLLECTION_TARGET target
8686
set tserr "No matching named collection (for target \"target\")."
8787
testouterr_cmd sh {savelist info} OK $tserr
88-
set tserr "$named_coll
88+
set tserr "[msg_named_coll]
8989
1) $coll1 3) $coll3 5) $coll6f 7) infocmd
9090
2) $coll2 4) $coll4f 6) $colld 8) infocmdexp "
9191
testouterr_cmd sh {savelist -w 80 --all} OK $tserr
92-
set tserr "$matching_named_coll\n 1) infocmd 2) infocmdexp "
92+
set tserr "[msg_named_coll 1]\n 1) infocmd 2) infocmdexp "
9393
testouterr_cmd sh {savelist -a info} OK $tserr
9494
unsetenv_var MODULES_COLLECTION_TARGET
9595

9696
# glob match
97-
set tserr "$matching_named_coll\n 1) infocmd 2) infocmdexp "
97+
set tserr "[msg_named_coll 1]\n 1) infocmd 2) infocmdexp "
9898
testouterr_cmd sh {savelist -S *cmd} OK $tserr
9999
testouterr_cmd sh {savelist -S ?nfo} OK $tserr
100100
testouterr_cmd sh {savelist -i -S i?fO} OK $tserr
101101
testouterr_cmd sh {savelist -C ocm?} OK $tserr
102102

103-
set tserr "$matching_named_coll
103+
set tserr "[msg_named_coll 1]
104104
1) $coll1 3) $coll3 5) $coll6f 7) infocmd
105105
2) $coll2 4) $coll4f 6) $colld 8) infocmdexp "
106106
testouterr_cmd sh {savelist -w 80 *} OK $tserr
107107
testouterr_cmd sh {savelist -w 80 ?} OK $tserr
108108

109109

110110
# ml
111-
set tserr "$matching_named_coll\n 1) infocmd 2) infocmdexp "
111+
set tserr "[msg_named_coll 1]\n 1) infocmd 2) infocmdexp "
112112
testouterr_cmd sh {ml savelist info} OK $tserr
113113
if {$install_icase eq {search}} {
114114
testouterr_cmd sh {ml savelist INFO} OK $tserr
115115
} else {
116-
testouterr_cmd sh {ml savelist INFO} OK $no_matching_named_coll
116+
testouterr_cmd sh {ml savelist INFO} OK [msg_no_named_coll 1]
117117
}
118118
testouterr_cmd sh {ml savelist -S *cmd} OK $tserr
119119
testouterr_cmd sh {ml savelist -S ?nfo} OK $tserr
120120
testouterr_cmd sh {ml savelist -C cmd} OK $tserr
121-
set tserr $no_matching_named_coll
121+
set tserr [msg_no_named_coll 1]
122122
testouterr_cmd sh {ml savelist foo} OK $tserr
123123
setenv_var MODULES_COLLECTION_TARGET target
124-
set tserr "$named_coll
124+
set tserr "[msg_named_coll]
125125
1) $coll1 3) $coll3 5) $coll6f 7) infocmd
126126
2) $coll2 4) $coll4f 6) $colld 8) infocmdexp "
127127
testouterr_cmd sh {ml savelist -w 80 --all} OK $tserr
128-
set tserr "$matching_named_coll\n 1) infocmd 2) infocmdexp "
128+
set tserr "[msg_named_coll 1]\n 1) infocmd 2) infocmdexp "
129129
testouterr_cmd sh {ml savelist -a info} OK $tserr
130130
unsetenv_var MODULES_COLLECTION_TARGET
131131

‎testsuite/modules.61-coll/080-access-coll.exp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ file copy -force $coll1fp $coll1fpsave
9393

9494
change_file_perms $coll1fp $hide_perms
9595

96-
testouterr_cmd "sh" "savelist -t" "OK" "$named_coll\n$coll_list_nocoll1"
96+
testouterr_cmd "sh" "savelist -t" "OK" "[msg_named_coll]\n$coll_list_nocoll1"
9797
testouterr_cmd "sh" "saveshow $coll1" "ERR" [err_permdenied $coll1fp]
9898
testouterr_cmd "sh" "restore $coll1" "ERR" [err_permdenied $coll1fp]
9999
testouterr_cmd "sh" "save $coll1" "OK" ""
@@ -110,7 +110,7 @@ restore_file_perms $coll1fp
110110

111111
change_file_perms $coll1fp $write_perms
112112

113-
testouterr_cmd "sh" "savelist -t" "OK" "$named_coll\n$coll_list"
113+
testouterr_cmd "sh" "savelist -t" "OK" "[msg_named_coll]\n$coll_list"
114114
testouterr_cmd_re "sh" "saveshow $coll1" "OK" "$modlin\n$coll1fpre:\n\n$presavedc1cont1re\n$modlin"
115115
testouterr_cmd_re "sh" "restore $coll1" $ans "$c1errmsg"
116116
testouterr_cmd "sh" "save $coll1" "ERR" "$save_msg\n$perm_msg"
@@ -152,7 +152,7 @@ file copy -force $coll1fpsave $coll1fp
152152

153153
change_file_perms $homewithcolldotmod $write_perms
154154

155-
testouterr_cmd "sh" "savelist -t" "OK" "$named_coll\n$coll_list"
155+
testouterr_cmd "sh" "savelist -t" "OK" "[msg_named_coll]\n$coll_list"
156156
testouterr_cmd_re "sh" "saveshow $coll1" "OK" "$modlin\n$coll1fpre:\n\n$presavedc1cont1re\n$modlin"
157157
testouterr_cmd_re "sh" "restore $coll1" $ans "$c1errmsg"
158158
testouterr_cmd "sh" "save $coll1" "OK" ""

‎testsuite/modules.70-maint/190-emptyarg.exp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ foreach cmd [list whatis apropos] {
102102
}
103103
testouterr_cmd_re "sh" "avail " "" ".+"
104104
testouterr_cmd_re sh {list } OK .+
105-
testouterr_cmd_re sh {savelist } OK $no_named_coll
105+
testouterr_cmd_re sh {savelist } OK [msg_no_named_coll]
106106
# except for non-wild search like paths sub-command
107107
testouterr_cmd_re "sh" "paths " "" ".+"
108108

‎testsuite/modules.70-maint/350-term_width.exp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -459,18 +459,18 @@ unsetenv_loaded_module
459459
setenv_var HOME $ORIG_HOME/home
460460

461461
setenv_var MODULES_TERM_WIDTH "80"
462-
testerr_cmd sh {savelist} "$named_coll
462+
testerr_cmd sh {savelist} "[msg_named_coll]
463463
1) coll1 3) coll3 5) coll6.target 7) infocmd
464464
2) coll2 4) coll4.target 6) default 8) infocmdexp "
465465
unsetenv_var MODULES_TERM_WIDTH
466466

467467

468468
setenv_var MODULES_TERM_WIDTH "80"
469-
testerr_cmd sh {savelist --width=0} "$named_coll
469+
testerr_cmd sh {savelist --width=0} "[msg_named_coll]
470470
1) coll1 2) coll2 3) coll3 4) coll4.target 5) coll6.target 6) default 7) infocmd 8) infocmdexp "
471471
unsetenv_var MODULES_TERM_WIDTH
472472

473-
testerr_cmd sh {savelist -w 1} "$named_coll
473+
testerr_cmd sh {savelist -w 1} "[msg_named_coll]
474474
1) coll1
475475
2) coll2
476476
3) coll3

0 commit comments

Comments
 (0)