Skip to content

Commit 8a68787

Browse files
committed
ts: update tests with tags reported in msg block
1 parent 99d9483 commit 8a68787

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+501
-495
lines changed

testsuite/install.00-init/020-module.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ foreach shell $othlang_list {
119119
}
120120

121121
# ensure advanced_version_spec is efficient on all shells
122-
set loadunloadout "Loading advvers6/1.3\n Loading requirement: advvers7/1.0\nUnloading advvers7/1.0\n Unloading dependent: advvers6/1.3"
122+
set loadunloadout "Loading advvers6/1.3\n Loading requirement: advvers7/1.0\nUnloading advvers7/1.0 <aL>\n Unloading dependent: advvers6/1.3"
123123
if {![is_config_locked implicit_default]} {
124124
foreach shell $shell_list {
125125
testall_cmd $shell "module use $testsuite_modpath.2\; module config implicit_default 1\; module config verbosity normal\; module config advanced_version_spec 1\; module load --auto [email protected]\; module unload --auto [email protected]" {} $loadunloadout 0

testsuite/install.00-init/024-ml.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ foreach shell $othlang_list {
122122
}
123123

124124
# ensure advanced_version_spec is efficient on all shells
125-
set loadunloadout "Loading advvers6/1.3\n Loading requirement: advvers7/1.0\nUnloading advvers7/1.0\n Unloading dependent: advvers6/1.3"
125+
set loadunloadout "Loading advvers6/1.3\n Loading requirement: advvers7/1.0\nUnloading advvers7/1.0 <aL>\n Unloading dependent: advvers6/1.3"
126126
if {![is_config_locked implicit_default]} {
127127
foreach shell $shell_list {
128128
testall_cmd $shell "ml use $testsuite_modpath.2\; ml config implicit_default 1\; ml config verbosity normal\; ml config advanced_version_spec 1\; ml --auto [email protected]\; ml --auto [email protected]" {} $loadunloadout 0

testsuite/modules.00-init/130-auto_handling.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ set module_tron "trace/all_on"
2525
set modulefile_tron "$modpath/$module_tron"
2626

2727
set err_pre [msg_load $module [err_prereq $module_tron]]
28-
set err_trace [msg_load $module_tron "$warn_msgs: 'module-trace' command not implemented"]
28+
set err_trace [msg_load "$module_tron <aL>" "$warn_msgs: 'module-trace' command not implemented"]
2929
append err_trace \n\n[msg_top_load $module {} $module_tron {}]
3030

3131
set ans [list]

testsuite/modules.20-locate/100-wspace.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ lappend ans [list unset __MODULES_LMPREREQ]
290290
lappend ans [list unset _LMFILES_]
291291
lappend ans [list unset LOADEDMODULES]
292292
lappend ans [list unset __MODULES_LMTAG]
293-
testouterr_cmd_re sh {unload --auto space\ yc/3} $ans [msg_top_unload {'space yc/3'} {{'space yc/2'} {spacenc/2}} {} {}]
293+
testouterr_cmd_re sh {unload --auto space\ yc/3} $ans [msg_top_unload {'space yc/3' <aL>} {{'space yc/2'} {spacenc/2}} {} {}]
294294
# test UReqUn mechanism
295295
testouterr_cmd_re sh {unload --auto space\ yc/2} $ans [msg_top_unload {'space yc/2'} {} {{spacenc/2} {'space yc/3'}} {}]
296296

testsuite/modules.20-locate/115-forbid.exp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -735,10 +735,10 @@ lappend ans2 [list unset _LMFILES_]
735735
lappend ans2 [list unset LOADEDMODULES]
736736
set tomorrow [clock format [expr {[clock seconds]+86400}] -format %Y-%m-%d]
737737
if {$install_nearlyforbiddendays >= 1} {
738-
testouterr_cmd sh {load hide1/5.0} $ans [msg_load hide1/5.0 [err_accessnearlydenied $tomorrow]]
738+
testouterr_cmd sh {load hide1/5.0} $ans [msg_load {hide1/5.0 <nF>} [err_accessnearlydenied $tomorrow]]
739739
}
740740
setenv_var MODULES_NEARLY_FORBIDDEN_DAYS 1
741-
testouterr_cmd sh {load hide1/5.0} $ans [msg_load hide1/5.0 [err_accessnearlydenied $tomorrow]]
741+
testouterr_cmd sh {load hide1/5.0} $ans [msg_load {hide1/5.0 <nF>} [err_accessnearlydenied $tomorrow]]
742742
testouterr_cmd_re sh {display hide1/5.0} OK "$modlin\n$mpre/hide1/5.0:\n\n[err_accessnearlydenied $tomorrow]\nmodule-whatis\thide1/5.0\n$modlin"
743743
testouterr_cmd_re sh {whatis hide1/5.0} OK "$modlin $mpre $modlin\n\\s+hide1/5.0: hide1/5.0"
744744
testouterr_cmd sh {avail -t hide1/5.0} OK "$mp:\nhide1/5.0 <nF>"
@@ -767,32 +767,32 @@ lappend ans [list set __MODULES_LMALTNAME hide1/5.0&as|hide1/latest]
767767
lappend ans [list set _LMFILES_ $mp/hide1/5.0]
768768
lappend ans [list set LOADEDMODULES hide1/5.0]
769769
lappend ans [list set __MODULES_LMTAG hide1/5.0&nearly-forbidden]
770-
testouterr_cmd sh {load hide1/5.0} $ans [msg_load hide1/5.0 [err_accessnearlydenied $tomorrow]]
770+
testouterr_cmd sh {load hide1/5.0} $ans [msg_load {hide1/5.0 <nF>} [err_accessnearlydenied $tomorrow]]
771771
unsetenv_var TESTSUITE_FORBID1_NEARLY_SET2
772772

773773
setenv_var TESTSUITE_FORBID1_NEARLY_SET3 1
774774
set tomorrow [clock format [expr {[clock seconds]+86400}] -format %Y-%m-%d]
775-
testouterr_cmd sh {load hide1/5.0} $ans [msg_load hide1/5.0 [err_accessnearlydenied $tomorrow "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\nSed non risus. Suspendisse lectus tortor, dignissim sit amet,\nadipiscing nec, ultricies sed, dolor.\n Cras elementum ultrices diam. Maecenas ligula massa, varius a, semper congue, euismod non, mi."]]
775+
testouterr_cmd sh {load hide1/5.0} $ans [msg_load {hide1/5.0 <nF>} [err_accessnearlydenied $tomorrow "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\nSed non risus. Suspendisse lectus tortor, dignissim sit amet,\nadipiscing nec, ultricies sed, dolor.\n Cras elementum ultrices diam. Maecenas ligula massa, varius a, semper congue, euismod non, mi."]]
776776
unsetenv_var TESTSUITE_FORBID1_NEARLY_SET3
777777

778778
setenv_var TESTSUITE_FORBID1_NEARLY_SET4 1
779779
set tomorrow [clock format [expr {[clock seconds]+86400}] -format %Y-%m-%d]
780-
testouterr_cmd sh {load hide1/5.0} $ans [msg_load hide1/5.0 [err_accessnearlydenied $tomorrow {Lorem ipsum dolor sit amet, consectetur adipiscing elit.}]]
780+
testouterr_cmd sh {load hide1/5.0} $ans [msg_load {hide1/5.0 <nF>} [err_accessnearlydenied $tomorrow {Lorem ipsum dolor sit amet, consectetur adipiscing elit.}]]
781781
unsetenv_var TESTSUITE_FORBID1_NEARLY_SET4
782782

783783
setenv_var TESTSUITE_FORBID1_NEARLY_SET5 1
784784
set tomorrow [clock format [expr {[clock seconds]+86400}] -format %Y-%m-%d]
785-
testouterr_cmd sh {load hide1/5.0} $ans [msg_load hide1/5.0 [err_accessnearlydenied $tomorrow]]
785+
testouterr_cmd sh {load hide1/5.0} $ans [msg_load {hide1/5.0 <nF>} [err_accessnearlydenied $tomorrow]]
786786
unsetenv_var TESTSUITE_FORBID1_NEARLY_SET5
787787

788788
setenv_var TESTSUITE_FORBID1_NEARLY_SET6 1
789789
set tomorrow [clock format [expr {[clock seconds]+86400}] -format %Y-%m-%d]
790-
testouterr_cmd sh {load hide1/5.0} $ans [msg_load hide1/5.0 [err_accessnearlydenied $tomorrow]]
790+
testouterr_cmd sh {load hide1/5.0} $ans [msg_load {hide1/5.0 <nF>} [err_accessnearlydenied $tomorrow]]
791791
unsetenv_var TESTSUITE_FORBID1_NEARLY_SET6
792792

793793
setenv_var TESTSUITE_FORBID1_NEARLY_SET7 1
794794
set tomorrow [clock format [expr {[clock seconds]+86400}] -format %Y-%m-%d]
795-
testouterr_cmd sh {load hide1/5.0} $ans [msg_load hide1/5.0 [err_accessnearlydenied $tomorrow {Lorem ipsum dolor sit amet, consectetur adipiscing elit.}]]
795+
testouterr_cmd sh {load hide1/5.0} $ans [msg_load {hide1/5.0 <nF>} [err_accessnearlydenied $tomorrow {Lorem ipsum dolor sit amet, consectetur adipiscing elit.}]]
796796
unsetenv_var TESTSUITE_FORBID1_NEARLY_SET7
797797

798798
# --nearly-message specification error
@@ -823,7 +823,7 @@ unsetenv_var TESTSUITE_FORBID1_NEARLY_ERR1
823823
setenv_var TESTSUITE_FORBID1_NEARLY_SET4 1
824824
if {$install_nearlyforbiddendays >= 1} {
825825
set tomorrow [clock format [expr {[clock seconds]+86400}] -format %Y-%m-%d]
826-
set tserr [msg_load hide1/5.0 [err_accessnearlydenied $tomorrow {Lorem ipsum dolor sit amet, consectetur adipiscing elit.}]]
826+
set tserr [msg_load {hide1/5.0 <nF>} [err_accessnearlydenied $tomorrow {Lorem ipsum dolor sit amet, consectetur adipiscing elit.}]]
827827
} else {
828828
set tserr {}
829829
}

testsuite/modules.20-locate/118-hidden-loaded.exp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,9 @@ testouterr_cmd_re sh {load hide3/1.0 hidereq/4.1} $ans $no_loaded
178178

179179
# ensure hidden state is recovered and hidden mod load is not reported if automatically triggered
180180
# on collection restore
181-
testouterr_cmd_re sh {restore testsuite/home/coll-hide-once-loaded} $ans "Loading hide3/1.0\n$no_loaded\nLoading hidereq/4.1"
181+
testouterr_cmd_re sh {restore testsuite/home/coll-hide-once-loaded} $ans "Loading hide3/1.0 <H>\n$no_loaded\nLoading hidereq/4.1"
182182
# unless verbose2 level activated
183-
testouterr_cmd_re sh {restore -v -v testsuite/home/coll-hide-once-loaded} $ans "Loading hide3/1.0\n$no_loaded\nLoading hidereq/4.1"
183+
testouterr_cmd_re sh {restore -v -v testsuite/home/coll-hide-once-loaded} $ans "Loading hide3/1.0 <H>\n$no_loaded\nLoading hidereq/4.1"
184184
set ans [list]
185185
lappend ans [list set __MODULES_LMALTNAME hide3/1.0&as|hide3/default&as|hide3/latest]
186186
lappend ans [list set _LMFILES_ $mp/hide3/1.0:$mp/hidereq/4.1]
@@ -189,15 +189,15 @@ lappend ans [list set __MODULES_LMTAG hide3/1.0&auto-loaded&hidden-loaded]
189189
testouterr_cmd_re sh {restore testsuite/home/coll-hide-once-loaded-nuasked} $ans "$no_loaded\nLoading hidereq/4.1"
190190
setenv_var MODULES_VERBOSITY verbose
191191
testouterr_cmd_re sh {restore testsuite/home/coll-hide-once-loaded-nuasked} $ans "$no_loaded\nLoading hidereq/4.1"
192-
testouterr_cmd_re sh {restore -v -v testsuite/home/coll-hide-once-loaded-nuasked} $ans "Loading hide3/1.0\n$no_loaded\nLoading hidereq/4.1"
192+
testouterr_cmd_re sh {restore -v -v testsuite/home/coll-hide-once-loaded-nuasked} $ans "Loading hide3/1.0 <aL:H>\n$no_loaded\nLoading hidereq/4.1"
193193
setenv_var MODULES_VERBOSITY verbose2
194194
testouterr_cmd_re sh {restore -v testsuite/home/coll-hide-once-loaded-nuasked} $ans "$no_loaded\nLoading hidereq/4.1"
195-
testouterr_cmd_re sh {restore testsuite/home/coll-hide-once-loaded-nuasked} $ans "Loading hide3/1.0\n$no_loaded\nLoading hidereq/4.1"
196-
testouterr_cmd_re sh {restore -v -v testsuite/home/coll-hide-once-loaded-nuasked} $ans "Loading hide3/1.0\n$no_loaded\nLoading hidereq/4.1"
195+
testouterr_cmd_re sh {restore testsuite/home/coll-hide-once-loaded-nuasked} $ans "Loading hide3/1.0 <aL:H>\n$no_loaded\nLoading hidereq/4.1"
196+
testouterr_cmd_re sh {restore -v -v testsuite/home/coll-hide-once-loaded-nuasked} $ans "Loading hide3/1.0 <aL:H>\n$no_loaded\nLoading hidereq/4.1"
197197
setenv_var MODULES_VERBOSITY normal
198-
testouterr_cmd_re sh {restore -v -v testsuite/home/coll-hide-once-loaded-nuasked} $ans "Loading hide3/1.0\n$no_loaded\nLoading hidereq/4.1"
199-
testouterr_cmd_re sh {restore -vv testsuite/home/coll-hide-once-loaded-nuasked} $ans "Loading hide3/1.0\n$no_loaded\nLoading hidereq/4.1"
200-
testouterr_cmd_re sh {--verbose restore --verbose testsuite/home/coll-hide-once-loaded-nuasked} $ans "Loading hide3/1.0\n$no_loaded\nLoading hidereq/4.1"
198+
testouterr_cmd_re sh {restore -v -v testsuite/home/coll-hide-once-loaded-nuasked} $ans "Loading hide3/1.0 <aL:H>\n$no_loaded\nLoading hidereq/4.1"
199+
testouterr_cmd_re sh {restore -vv testsuite/home/coll-hide-once-loaded-nuasked} $ans "Loading hide3/1.0 <aL:H>\n$no_loaded\nLoading hidereq/4.1"
200+
testouterr_cmd_re sh {--verbose restore --verbose testsuite/home/coll-hide-once-loaded-nuasked} $ans "Loading hide3/1.0 <aL:H>\n$no_loaded\nLoading hidereq/4.1"
201201

202202
# on scriptfile source
203203
# work on scriptfile located in current dir to cope with the relative path definition set in it
@@ -208,8 +208,8 @@ lappend ans [list set _LMFILES_ $mp/hide3/1.0:$mp/hidereq/4.1]
208208
lappend ans [list set LOADEDMODULES hide3/1.0:hidereq/4.1]
209209
lappend ans [list set __MODULES_LMTAG hide3/1.0&hidden-loaded]
210210
lappend ans [list set MODULEPATH $mp]
211-
testouterr_cmd_re sh {source coll-hide-once-loaded} $ans "Loading hide3/1.0\n$no_loaded\nLoading hidereq/4.1"
212-
testouterr_cmd_re sh {source -vv coll-hide-once-loaded} $ans "Loading hide3/1.0\n$no_loaded\nLoading hidereq/4.1"
211+
testouterr_cmd_re sh {source coll-hide-once-loaded} $ans "Loading hide3/1.0 <H>\n$no_loaded\nLoading hidereq/4.1"
212+
testouterr_cmd_re sh {source -vv coll-hide-once-loaded} $ans "Loading hide3/1.0 <H>\n$no_loaded\nLoading hidereq/4.1"
213213
file delete coll-hide-once-loaded
214214
set ans [list]
215215
lappend ans [list set __MODULES_LMALTNAME hide3/1.0&as|hide3/default&as|hide3/latest]
@@ -221,10 +221,10 @@ testouterr_cmd_re sh {source testsuite/modulefiles.2/hidereq/4.3} $ans "Loading
221221
setenv_var MODULES_VERBOSITY verbose
222222
testouterr_cmd_re sh {source testsuite/modulefiles.2/hidereq/4.3} $ans "Loading hidereq/4.2"
223223
setenv_var MODULES_VERBOSITY verbose2
224-
testouterr_cmd_re sh {source testsuite/modulefiles.2/hidereq/4.3} $ans [msg_load hide3/1.0]\n\n[msg_top_load hidereq/4.2 {} hide3/1.0 {}]
224+
testouterr_cmd_re sh {source testsuite/modulefiles.2/hidereq/4.3} $ans [msg_load {hide3/1.0 <aL:H>} ]\n\n[msg_top_load hidereq/4.2 {} hide3/1.0 {}]
225225
setenv_var MODULES_VERBOSITY normal
226-
testouterr_cmd_re sh {source -vv testsuite/modulefiles.2/hidereq/4.3} $ans [msg_load hide3/1.0]\n\n[msg_top_load hidereq/4.2 {} hide3/1.0 {}]
227-
testouterr_cmd_re sh {source -v -v testsuite/modulefiles.2/hidereq/4.3} $ans [msg_load hide3/1.0]\n\n[msg_top_load hidereq/4.2 {} hide3/1.0 {}]
226+
testouterr_cmd_re sh {source -vv testsuite/modulefiles.2/hidereq/4.3} $ans [msg_load {hide3/1.0 <aL:H>}]\n\n[msg_top_load hidereq/4.2 {} hide3/1.0 {}]
227+
testouterr_cmd_re sh {source -v -v testsuite/modulefiles.2/hidereq/4.3} $ans [msg_load {hide3/1.0 <aL:H>}]\n\n[msg_top_load hidereq/4.2 {} hide3/1.0 {}]
228228

229229

230230
#

testsuite/modules.20-locate/119-hide-cascading.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ lappend ans2 [list set __MODULES_LMALTNAME hide1/5.0&as|hide1/latest]
279279
lappend ans2 [list set _LMFILES_ $mp/hide1/5.0]
280280
lappend ans2 [list set LOADEDMODULES hide1/5.0]
281281
lappend ans2 [list set __MODULES_LMTAG hide1/5.0&nearly-forbidden]
282-
testouterr_cmd sh {load [email protected]} $ans2 [msg_load hide1/5.0 [err_accessnearlydenied [clock format [expr {[clock seconds]+86400}] -format %Y-%m-%d]]]
282+
testouterr_cmd sh {load [email protected]} $ans2 [msg_load {hide1/5.0 <nF>} [err_accessnearlydenied [clock format [expr {[clock seconds]+86400}] -format %Y-%m-%d]]]
283283
testouterr_cmd sh {avail -t [email protected]} OK "$mp:\nhide1/5.0 <nF>"
284284
unsetenv_var TESTSUITE_HIDE1_CASC6_SET3
285285

testsuite/modules.50-cmds/078-refresh.exp

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ lappend ans [list out {echo refresh/2.0}]
149149
testouterr_cmd sh {refresh} $ans {}
150150

151151
# verbose output mode
152-
set tserr2 [msg_refresh refresh/1.0]\n[msg_refresh refresh/2.0{+foo}]
152+
set tserr2 [msg_refresh refresh/1.0]\n[msg_refresh {refresh/2.0{+foo} <bar>}]
153153
testouterr_cmd sh {refresh -v} $ans $tserr2
154154

155155
# verbose output and hidden-loaded module
@@ -168,6 +168,7 @@ lappend ans [list alias alisloaded1 {echo is-loaded ok}]
168168
lappend ans [list funcfoo "() {" "echo foo2; };"]
169169
lappend ans [list out {echo refresh/1.0}]
170170
lappend ans [list out {echo refresh/2.0}]
171+
set tserr2 [msg_refresh refresh/1.0]\n[msg_refresh {refresh/2.0{+foo} <bar:H>}]
171172
testouterr_cmd sh {refresh -v} $ans $tserr2
172173

173174
# verbose output and hidden-loaded module
@@ -186,9 +187,11 @@ lappend ans [list funcfoo "() {" "echo foo2; };"]
186187
lappend ans [list out {echo refresh/1.0}]
187188
lappend ans [list out {echo refresh/2.0}]
188189
testouterr_cmd sh {refresh -v} $ans $tserr1
190+
set tserr2 [msg_refresh refresh/1.0]\n[msg_refresh {refresh/2.0{+foo} <aL:bar:H>}]
189191
testouterr_cmd sh {refresh -vv} $ans $tserr2
190192
setenv_var __MODULES_LMTAG refresh/1.0&hidden-loaded&auto-loaded:refresh/2.0&bar&hidden-loaded&auto-loaded
191193
testouterr_cmd sh {refresh -v} $ans {}
194+
set tserr2 [msg_refresh {refresh/1.0 <aL:H>}]\n[msg_refresh {refresh/2.0{+foo} <aL:bar:H>}]
192195
testouterr_cmd sh {refresh -vv} $ans $tserr2
193196
unsetenv_var __MODULES_LMTAG
194197

@@ -230,10 +233,10 @@ lappend ans1 [list ERR]
230233
testouterr_cmd sh {refresh} $ans1 [msg_refresh refresh/1.0 $err_evalabort]
231234

232235
# verbose output
233-
testouterr_cmd sh {refresh -v} $ans1 [msg_refresh refresh/1.0 $err_evalabort]\n\n[msg_refresh refresh/2.0{+foo}]
236+
testouterr_cmd sh {refresh -v} $ans1 [msg_refresh refresh/1.0 $err_evalabort]\n\n[msg_refresh {refresh/2.0{+foo} <bar>}]
234237
# hidden-loaded/auto-loaded
235238
setenv_var __MODULES_LMTAG refresh/1.0&bar&hidden-loaded&auto-loaded:refresh/2.0&bar
236-
set tserr [msg_refresh refresh/1.0 $err_evalabort]
239+
set tserr [msg_refresh {refresh/1.0 <aL:bar:H>} $err_evalabort]
237240
testouterr_cmd sh {refresh} $ans1 $tserr
238241
setenv_var __MODULES_LMTAG refresh/2.0&bar
239242

@@ -252,12 +255,12 @@ lappend ans2 [list alias almode {echo refresh}]
252255
lappend ans2 [list funcfoo "() {" "echo foo1; };"]
253256
lappend ans2 [list out {echo refresh/1.0}]
254257
lappend ans2 [list ERR]
255-
set tserr [msg_refresh refresh/2.0{+foo} $err_evalabort]
258+
set tserr [msg_refresh {refresh/2.0{+foo} <bar>} $err_evalabort]
256259
testouterr_cmd sh {refresh} $ans2 $tserr
257260

258261
# break in both loaded modules
259262
setenv_var TESTSUITE_REFRESH break0
260-
testouterr_cmd sh {refresh} ERR [msg_refresh refresh/1.0 $err_evalabort]\n\n[msg_refresh refresh/2.0{+foo} $err_evalabort]
263+
testouterr_cmd sh {refresh} ERR [msg_refresh refresh/1.0 $err_evalabort]\n\n[msg_refresh {refresh/2.0{+foo} <bar>} $err_evalabort]
261264

262265
# unknown command
263266
setenv_var TESTSUITE_REFRESH badcmd1
@@ -290,7 +293,7 @@ if {[cmpversion $tclsh_version 8.6] == -1} {
290293
set custom {}
291294
set linenum 19
292295
}
293-
set tserr [msg_refresh refresh/2.0{+foo} [msg_moderr {invalid command name "unk"} {unk} $mp/refresh/2.0 $linenum {} {} {} $custom]]
296+
set tserr [msg_refresh {refresh/2.0{+foo} <bar>} [msg_moderr {invalid command name "unk"} {unk} $mp/refresh/2.0 $linenum {} {} {} $custom]]
294297
testouterr_cmd sh {refresh} $ans2 $tserr
295298

296299
# continue command
@@ -323,15 +326,15 @@ lappend ans [list out {echo refresh/1.0}]
323326
testouterr_cmd sh {refresh} $ans {}
324327

325328
# verbose output
326-
set tserr [msg_refresh refresh/1.0]\n[msg_refresh refresh/2.0{+foo}]
329+
set tserr [msg_refresh refresh/1.0]\n[msg_refresh {refresh/2.0{+foo} <bar>}]
327330
testouterr_cmd sh {refresh -v} $ans $tserr
328331

329332
# exit command
330333
setenv_var TESTSUITE_REFRESH exit1
331334
set tserr [msg_refresh refresh/1.0 $err_evalabort]
332335
testouterr_cmd sh {refresh} ERR $tserr
333336
setenv_var TESTSUITE_REFRESH exit2
334-
set tserr [msg_refresh refresh/2.0{+foo} $err_evalabort]
337+
set tserr [msg_refresh {refresh/2.0{+foo} <bar>} $err_evalabort]
335338
testouterr_cmd sh {refresh} $ans2 $tserr
336339

337340

testsuite/modules.50-cmds/120-prereq-full.exp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@ set modulefile_troff "$modpath/$module_troff"
5050
set err_pre [msg_load $module [err_prereq "trace/all_on"]]
5151
set err_trace "$warn_msgs: 'module-trace' command not implemented"
5252

53-
set msg_load_tron [msg_load $module_tron $err_trace]
54-
set msg_unload_tron [msg_unload $module_tron $err_trace]
53+
set msg_load_tron [msg_load "$module_tron <aL>" $err_trace]
54+
set msg_load_tron_noal [msg_load $module_tron $err_trace]
55+
set msg_unload_tron [msg_unload "$module_tron <aL>" $err_trace]
5556
set msg_top_load_module [msg_top_load $module {} $module_tron {}]
5657
set msg_top_unload_module [msg_top_unload $module {} $module_tron {}]
5758
set msg_top_switch_module [msg_top_switch $module $module {} {} {} $module_tron {}]
@@ -96,7 +97,7 @@ lappend ans [list set __MODULES_LMPREREQ "$module&$module_tron"]
9697
lappend ans [list set testsuite yes]
9798
lappend ans [list set _LMFILES_ "$modulefile_tron:$modulefile"]
9899
lappend ans [list set LOADEDMODULES "$module_tron:$module"]
99-
testouterr_cmd_re "ALL" "load $module_tron $module" $ans $msg_load_tron
100+
testouterr_cmd_re "ALL" "load $module_tron $module" $ans $msg_load_tron_noal
100101

101102

102103
# test situations where auto_handling is disabled and some constraints are unsatisfied
@@ -156,11 +157,11 @@ setenv_loaded_module [list $module] [list $modulefile]
156157
set ans [list]
157158
lappend ans [list set _LMFILES_ "$modulefile:$modulefile_tron"]
158159
lappend ans [list set LOADEDMODULES "$module:$module_tron"]
159-
testouterr_cmd_re "sh" "load --no-auto $module_tron" $ans $msg_load_tron
160+
testouterr_cmd_re "sh" "load --no-auto $module_tron" $ans $msg_load_tron_noal
160161

161162
# switch sub-command should obtain same result here
162-
testouterr_cmd_re "sh" "switch --no-auto $module_tron" $ans $msg_load_tron
163-
testouterr_cmd_re "sh" "switch --no-auto --force $module_tron" $ans $msg_load_tron
163+
testouterr_cmd_re "sh" "switch --no-auto $module_tron" $ans $msg_load_tron_noal
164+
testouterr_cmd_re "sh" "switch --no-auto --force $module_tron" $ans $msg_load_tron_noal
164165

165166
# in auto mode, requiring module is reloaded
166167
set ans [list]

0 commit comments

Comments
 (0)