Skip to content

Commit b6e1765

Browse files
xdelaruellexdelaruelle
committed
ts: tests tagging messages on verbose/verbose2 modes
1 parent 02ddfa1 commit b6e1765

File tree

3 files changed

+110
-1
lines changed

3 files changed

+110
-1
lines changed

‎testsuite/home/coll49-tosource‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#%Module5.0
2+
module load variant/3.0 bar=val2
3+
module load --tag=foo:keep-loaded tag/8.0 -bar +foo
4+
module load --tag=bar:keep-loaded foo/1.0
5+
module load keep/1.0

‎testsuite/modules.50-cmds/465-tag-opt.exp‎

Lines changed: 90 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# Authors: Xavier Delaruelle, [email protected]
1111
#
1212
# Description: Testuite testsequence
13-
# Command: load, try-load, load-any, unload, switch
13+
# Command: load, try-load, load-any, unload, switch, source
1414
# Modulefiles: tag
1515
# Sub-Command:
1616
#
@@ -225,6 +225,25 @@ set tserr [msg_top_load "$mod <bar>" {} foo/1.0 {}]
225225
testouterr_cmd sh "load --auto --tag=bar $mod" $ans $tserr
226226
testouterr_cmd sh "load --no-auto --tag=bar $mod" $ans $tserr
227227

228+
# test verbose messages
229+
set tserr [msg_load {foo/1.0 <aL:foo>}]\n\n[msg_top_load "$mod <bar>" {} foo/1.0 {}]
230+
testouterr_cmd sh "load -v --auto --tag=bar $mod" $ans $tserr
231+
testouterr_cmd sh "load -v --no-auto --tag=bar $mod" $ans $tserr
232+
testouterr_cmd sh "load -vv --auto --tag=bar $mod" $ans $tserr
233+
234+
# test messages when dependency is already loaded but not tagged
235+
setenv_loaded_module [list foo/1.0] [list $mp/foo/1.0]
236+
set ans [list]
237+
lappend ans [list set __MODULES_LMPREREQ $mod&foo/1.0]
238+
lappend ans [list set _LMFILES_ $mp/foo/1.0:$modfile]
239+
lappend ans [list set LOADEDMODULES foo/1.0:$mod]
240+
lappend ans [list set __MODULES_LMEXTRATAG foo/1.0&foo:$mod&bar]
241+
lappend ans [list set __MODULES_LMTAG foo/1.0&foo:$mod&bar]
242+
testouterr_cmd sh "load --auto --tag=bar $mod" $ans {}
243+
set tserr [msg_tag {foo/1.0 <foo>}]\n[msg_load "$mod <bar>"]
244+
testouterr_cmd sh "load -v --auto --tag=bar $mod" $ans $tserr
245+
testouterr_cmd sh "load -vv --auto --tag=bar $mod" $ans $tserr
246+
228247
setenv_loaded_module [list foo/1.0 $mod] [list $mp/foo/1.0 $modfile]
229248
setenv_path_var __MODULES_LMPREREQ $mod&foo/1.0
230249
setenv_path_var __MODULES_LMEXTRATAG foo/1.0&foo:$mod&bar
@@ -255,6 +274,38 @@ lappend ans [list set __MODULES_LMTAG foo/1.0&hidden-loaded&foo&auto-loaded:$mod
255274
set tserr [msg_load "$mod <bar>"]
256275
testouterr_cmd sh "load -v --tag=bar $mod" $ans $tserr
257276

277+
# test verbose messages
278+
set tserr [msg_load {foo/1.0 <aL:foo:H>}]\n\n[msg_top_load "$mod <bar>" {} foo/1.0 {}]
279+
testouterr_cmd sh "load -vv --tag=bar $mod" $ans $tserr
280+
281+
# test messages when dependency is already loaded but not tagged
282+
setenv_loaded_module [list foo/1.0] [list $mp/foo/1.0]
283+
set ans [list]
284+
lappend ans [list set __MODULES_LMPREREQ $mod&foo/1.0]
285+
lappend ans [list set _LMFILES_ $mp/foo/1.0:$modfile]
286+
lappend ans [list set LOADEDMODULES foo/1.0:$mod]
287+
lappend ans [list set __MODULES_LMEXTRATAG foo/1.0&hidden-loaded&foo:$mod&bar]
288+
lappend ans [list set __MODULES_LMTAG foo/1.0&hidden-loaded&foo:$mod&bar]
289+
testouterr_cmd sh "load --tag=bar $mod" $ans {}
290+
set tserr [msg_load "$mod <bar>"]
291+
testouterr_cmd sh "load -v --tag=bar $mod" $ans $tserr
292+
set tserr [msg_tag {foo/1.0 <foo:H>}]\n[msg_load "$mod <bar>"]
293+
testouterr_cmd sh "load -vv --tag=bar $mod" $ans $tserr
294+
295+
# test messages when dependency is already loaded, auto-loaded, but not tagged
296+
setenv_loaded_module [list foo/1.0] [list $mp/foo/1.0] [list foo/1.0]
297+
set ans [list]
298+
lappend ans [list set __MODULES_LMPREREQ $mod&foo/1.0]
299+
lappend ans [list set _LMFILES_ $mp/foo/1.0:$modfile]
300+
lappend ans [list set LOADEDMODULES foo/1.0:$mod]
301+
lappend ans [list set __MODULES_LMEXTRATAG foo/1.0&hidden-loaded&foo:$mod&bar]
302+
lappend ans [list set __MODULES_LMTAG foo/1.0&auto-loaded&hidden-loaded&foo:$mod&bar]
303+
testouterr_cmd sh "load --tag=bar $mod" $ans {}
304+
set tserr [msg_load "$mod <bar>"]
305+
testouterr_cmd sh "load -v --tag=bar $mod" $ans $tserr
306+
set tserr [msg_tag {foo/1.0 <aL:foo:H>}]\n[msg_load "$mod <bar>"]
307+
testouterr_cmd sh "load -vv --tag=bar $mod" $ans $tserr
308+
258309
setenv_loaded_module [list foo/1.0 $mod] [list $mp/foo/1.0 $modfile]
259310
setenv_path_var __MODULES_LMPREREQ $mod&foo/1.0
260311
setenv_path_var __MODULES_LMEXTRATAG foo/1.0&hidden-loaded&foo:$mod&bar
@@ -412,6 +463,11 @@ lappend ans [list set __MODULES_LMEXTRATAG foo/1.0&foo]
412463
lappend ans [list set __MODULES_LMTAG foo/1.0&foo]
413464
testouterr_cmd sh "load $mod" $ans {}
414465

466+
# test verbose message when requirement is already loaded
467+
set tserr [msg_tag {foo/1.0 <foo>}]\n[msg_load tag/8.0]
468+
testouterr_cmd sh "load -v $mod" $ans $tserr
469+
testouterr_cmd sh "load -vv $mod" $ans $tserr
470+
415471
setenv_path_var __MODULES_LMEXTRATAG foo/1.0&bar
416472
setenv_path_var __MODULES_LMTAG foo/1.0&bar
417473
set ans [list]
@@ -1174,6 +1230,39 @@ set tserr [escre [msg_load $mod [msg_moderr {Missing value for '--tag' option} {
11741230
testouterr_cmd_re sh "load $mod" ERR $tserr
11751231

11761232

1233+
# test verbose messages on source sub-cmd with already loaded modules
1234+
# 3rd module is auto-loaded, 2nd is not
1235+
# 4th module is hidden-loaded as extra tag, so it will be removed
1236+
# see messages in normal, verbose and verbose2 mode
1237+
setenv_var TESTSUITE_TAG_OPT coll49
1238+
setenv_var TESTSUITE_KEEP_LOADED coll49
1239+
setenv_var MODULES_ADVANCED_VERSION_SPEC 1
1240+
1241+
setenv_var __MODULES_LMVARIANT variant/3.0&bar|val2|0|0:tag/8.0&bar|0|1|0&foo|1|1|0
1242+
setenv_var __MODULES_LMPREREQ keep/1.0&foo/1.0
1243+
setenv_loaded_module [list variant/3.0 tag/8.0 foo/1.0 keep/1.0] [list $modpath.3/variant/3.0 $modpath.3/tag/8.0 $modpath.3/foo/1.0 $modpath.3/keep/1.0] [list foo/1.0]
1244+
setenv_var __MODULES_LMTAG tag/8.0&hidden-loaded:foo/1.0&auto-loaded&hidden-loaded:keep/1.0&hidden-loaded
1245+
setenv_var __MODULES_LMEXTRATAG keep/1.0&hidden-loaded
1246+
set ans [list]
1247+
lappend ans [list set __MODULES_LMEXTRATAG keep/1.0&hidden-loaded:tag/8.0&foo:foo/1.0&bar]
1248+
lappend ans [list set __MODULES_LMTAG keep/1.0&hidden-loaded:tag/8.0&hidden-loaded&foo&keep-loaded:foo/1.0&auto-loaded&hidden-loaded&bar&keep-loaded]
1249+
set coll49fp $env(HOME)/home/coll49-tosource
1250+
set tserr [msg_tag {tag/8.0{-bar:+foo} <foo:H:kL>}]\n[msg_tag {foo/1.0 <aL:bar:H:kL>}]
1251+
testouterr_cmd sh "source $coll49fp" $ans {}
1252+
testouterr_cmd sh "source -v $coll49fp" $ans $tserr
1253+
#FIXME: already loaded message printed in verbose2 mode prior Tagging message (with un-updated list of tags)
1254+
set tserr [msg_load variant/3.0{bar=val2} [info_alreadyloaded variant/3.0]]\n\n[msg_load {tag/8.0{-bar:+foo} <H>} [info_alreadyloaded tag/8.0]]\n\n[msg_tag {tag/8.0{-bar:+foo} <foo:H:kL>}]\n\n[msg_load {foo/1.0 <aL:H>} [info_alreadyloaded foo/1.0]]\n\n[msg_tag {foo/1.0 <aL:bar:H:kL>}]\n\n[msg_load {keep/1.0 <H>} [info_alreadyloaded keep/1.0]]
1255+
testouterr_cmd sh "source -vv $coll49fp" $ans $tserr
1256+
1257+
unsetenv_var __MODULES_LMVARIANT
1258+
unsetenv_var __MODULES_LMPREREQ
1259+
unsetenv_var __MODULES_LMTAG
1260+
unsetenv_var __MODULES_LMEXTRATAG
1261+
unsetenv_loaded_module
1262+
unsetenv_var TESTSUITE_KEEP_LOADED
1263+
unsetenv_var MODULES_ADVANCED_VERSION_SPEC
1264+
1265+
11771266
#
11781267
# Cleanup
11791268
#

‎testsuite/modules.61-coll/040-restore.exp‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1279,6 +1279,21 @@ lappend ans [list set __MODULES_LMTAG $c49mod2&[join $c49mod2tag &]:$c49mod3&bar
12791279
set tserr [msg_unload $c49mod4]\n[msg_unload "$c49mod3 <bar:kL>"]\n[msg_unload "$c49mod2{-bar:+foo} <aL:foo:kL>"]\n[msg_load "$c49mod2{-bar:+foo} <foo:kL>"]\n[msg_load "$c49mod3 <aL:bar:kL>"]\n[msg_load $c49mod4]
12801280
testouterr_cmd sh "restore $coll49fp" $ans $tserr
12811281

1282+
# restore module tagged hidden-loaded in env: 3rd module is auto-loaded, 2nd is not
1283+
# 4th module is hidden-loaded as extra tag, so it will be removed
1284+
# see messages in normal, verbose and verbose2 mode
1285+
setenv_var __MODULES_LMTAG $c49mod2&hidden-loaded:$c49mod3&auto-loaded&hidden-loaded:$c49mod4&hidden-loaded
1286+
setenv_var __MODULES_LMEXTRATAG $c49mod4&hidden-loaded
1287+
set ans [list]
1288+
lappend ans [list set __MODULES_LMEXTRATAG $c49lmextratag]
1289+
lappend ans [list set __MODULES_LMTAG $c49mod2&hidden-loaded&foo&keep-loaded:$c49mod3&auto-loaded&hidden-loaded&bar&keep-loaded]
1290+
set tserr [msg_tag "$c49mod2{-bar:+foo} <foo:H:kL>"]\n[msg_tag $c49mod4]
1291+
testouterr_cmd sh "restore $coll49fp" $ans $tserr
1292+
testouterr_cmd sh "restore -v $coll49fp" $ans $tserr
1293+
set tserr [msg_tag "$c49mod2{-bar:+foo} <foo:H:kL>"]\n[msg_tag "$c49mod3 <aL:bar:H:kL>"]\n[msg_tag $c49mod4]
1294+
testouterr_cmd sh "restore -vv $coll49fp" $ans $tserr
1295+
1296+
12821297
# keep-loaded tag defined by module-tag in modulerc
12831298
setenv_var TESTSUITE_TAG_OPT coll49keep
12841299
setenv_var TESTSUITE_KEEP_LOADED coll49keep

0 commit comments

Comments
 (0)