Skip to content

Commit 678b402

Browse files
xdelaruellexdelaruelle
committed
ts: adapt existing restore tests to the Tagging msg
1 parent 92cce2c commit 678b402

File tree

2 files changed

+27
-12
lines changed

2 files changed

+27
-12
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,12 @@ proc msg_refresh {mod args} {
442442
return $msg
443443
}
444444

445+
proc msg_tag {mod args} {
446+
set msg "Tagging $mod"
447+
append msg [eval msg_block_content $args]
448+
return $msg
449+
}
450+
445451
proc msg_top_load {mod unlist reqlolist deprelist args} {
446452
lassign [mix_depre_depun_list $deprelist {}] deprelist depunlist
447453

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

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -999,7 +999,7 @@ lappend ans [list set _LMFILES_ $c37lmf]
999999
lappend ans [list set LOADEDMODULES $c37lm]
10001000
lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag]
10011001
lappend ans [list set __MODULES_LMTAG $c37mod1&auto-loaded&foo:$c37mod2&[join $c37mod2tag &]]
1002-
set tserr [msg_load {tag/8.0 <bar:foo>}]
1002+
set tserr [msg_tag {variant/3.0{bar=val1} <aL:foo>}]\n[msg_load {tag/8.0 <bar:foo>}]
10031003
testouterr_cmd_re sh "restore $coll37fp" $ans $tserr
10041004

10051005
setenv_var __MODULES_LMTAG $c37mod1&foo
@@ -1034,7 +1034,7 @@ lappend ans [list set _LMFILES_ $c37lmf]
10341034
lappend ans [list set LOADEDMODULES $c37lm]
10351035
lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag]
10361036
lappend ans [list set __MODULES_LMTAG $c37lmtag]
1037-
set tserr [msg_load {tag/8.0 <bar:foo>}]
1037+
set tserr [msg_tag {variant/3.0{bar=val1} <aL:foo>}]\n[msg_load {tag/8.0 <bar:foo>}]
10381038
testouterr_cmd_re sh "restore $coll37fp" $ans $tserr
10391039

10401040
setenv_loaded_module [list foo/1.0 $c37mod1] [list $c37modpath1/foo/1.0 $c37modpath1/$c37mod1]
@@ -1074,7 +1074,8 @@ setenv_var __MODULES_LMEXTRATAG $c37mod1&[join $c37mod1extratag &]
10741074
set ans [list]
10751075
lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag]
10761076
lappend ans [list set __MODULES_LMTAG $c37mod1&[join $c37mod1tag &]&keep-loaded:$c37mod2&keep-loaded&foo]
1077-
testouterr_cmd_re sh "restore $coll37fp" $ans {}
1077+
set tserr [msg_tag {tag/8.0 <foo:kL>}]
1078+
testouterr_cmd_re sh "restore $coll37fp" $ans $tserr
10781079

10791080
unsetenv_loaded_module
10801081
unsetenv_var __MODULES_LMTAG
@@ -1220,26 +1221,31 @@ setenv_loaded_module [list $c49mod1 $c49mod2 $c49mod3 $c49mod4] [list $c49modpat
12201221
set ans [list]
12211222
lappend ans [list set __MODULES_LMEXTRATAG $c49lmextratag]
12221223
lappend ans [list set __MODULES_LMTAG $c49lmtag]
1223-
testouterr_cmd_re sh "restore $coll49fp" $ans {}
1224+
set tserr [msg_tag {tag/8.0{-bar:+foo} <foo:kL>}]\n[msg_tag {foo/1.0 <aL:bar:kL>}]
1225+
testouterr_cmd sh "restore $coll49fp" $ans $tserr
12241226

12251227
setenv_var __MODULES_LMTAG $c49mod1&bar&foo:$c49mod3&auto-loaded:$c49mod4&bar&foo
12261228
setenv_var __MODULES_LMEXTRATAG $c49mod1&bar&foo:$c49mod4&bar&foo
1227-
testouterr_cmd_re sh "restore $coll49fp" $ans {}
1229+
# message with no tag for 1st and 4th module, as their extra tag from env are removed
1230+
set tserr [msg_tag variant/3.0{bar=val2}]\n[msg_tag {tag/8.0{-bar:+foo} <foo:kL>}]\n[msg_tag {foo/1.0 <aL:bar:kL>}]\n[msg_tag keep/1.0]
1231+
testouterr_cmd sh "restore $coll49fp" $ans $tserr
12281232

12291233
setenv_var __MODULES_LMTAG $c49mod1&bar&foo:$c49mod3&auto-loaded:$c49mod4&foo
12301234
setenv_var __MODULES_LMEXTRATAG $c49mod1&bar
12311235
set ans [list]
12321236
lappend ans [list set __MODULES_LMEXTRATAG $c49lmextratag]
12331237
# foo tag is kept of 1st and 4th module as not set extra
12341238
lappend ans [list set __MODULES_LMTAG $c49mod4&foo:$c49mod1&foo:$c49lmtag]
1235-
testouterr_cmd_re sh "restore $coll49fp" $ans {}
1239+
set tserr [msg_tag {variant/3.0{bar=val2} <foo>}]\n[msg_tag {tag/8.0{-bar:+foo} <foo:kL>}]\n[msg_tag {foo/1.0 <aL:bar:kL>}]
1240+
testouterr_cmd sh "restore $coll49fp" $ans $tserr
12361241

12371242
setenv_var __MODULES_LMTAG $c49mod1&bar&foo:$c49mod3&auto-loaded&bar&keep-loaded:$c49mod4&bar&foo
12381243
setenv_var __MODULES_LMEXTRATAG $c49mod1&bar&foo:$c49mod3&bar:$c49mod4&bar&foo
12391244
set ans [list]
12401245
lappend ans [list set __MODULES_LMEXTRATAG $c49mod3&[join $c49mod3extratag &]:$c49mod2&[join $c49mod2extratag &]]
12411246
lappend ans [list set __MODULES_LMTAG $c49mod3&[join $c49mod3tag &]:$c49mod2&[join $c49mod2tag &]]
1242-
testouterr_cmd_re sh "restore $coll49fp" $ans {}
1247+
set tserr [msg_tag variant/3.0{bar=val2}]\n[msg_tag {tag/8.0{-bar:+foo} <foo:kL>}]\n[msg_tag keep/1.0]
1248+
testouterr_cmd sh "restore $coll49fp" $ans $tserr
12431249

12441250
setenv_var __MODULES_LMTAG $c49mod2&bar&foo:$c49mod3&auto-loaded&bar&foo
12451251
setenv_var __MODULES_LMEXTRATAG $c49mod2&bar
@@ -1248,14 +1254,16 @@ set ans [list]
12481254
# and 4th module is set non-extra
12491255
lappend ans [list unset __MODULES_LMEXTRATAG]
12501256
lappend ans [list set __MODULES_LMTAG $c49mod2&[join $c49mod2tag &]:$c49mod3&auto-loaded&bar&foo&keep-loaded]
1251-
testouterr_cmd_re sh "restore $coll49fp" $ans {}
1257+
set tserr [msg_tag {tag/8.0{-bar:+foo} <foo:kL>}]\n[msg_tag {foo/1.0 <aL:bar:foo:kL>}]
1258+
testouterr_cmd sh "restore $coll49fp" $ans $tserr
12521259

12531260
setenv_var __MODULES_LMTAG $c49mod2&bar&foo:$c49mod3&auto-loaded&bar&foo
12541261
setenv_var __MODULES_LMEXTRATAG $c49mod2&bar&foo
12551262
set ans [list]
12561263
lappend ans [list set __MODULES_LMEXTRATAG $c49mod2&foo]
12571264
lappend ans [list set __MODULES_LMTAG $c49mod2&[join $c49mod2tag &]:$c49mod3&auto-loaded&bar&foo&keep-loaded]
1258-
testouterr_cmd_re sh "restore $coll49fp" $ans {}
1265+
set tserr [msg_tag {tag/8.0{-bar:+foo} <foo:kL>}]\n[msg_tag {foo/1.0 <aL:bar:foo:kL>}]
1266+
testouterr_cmd sh "restore $coll49fp" $ans $tserr
12591267

12601268
# 2nd module is set auto-loaded in env, not in collection
12611269
# and 3rd module is not set auto-loaded in env, whereas it is in collection
@@ -1279,7 +1287,8 @@ setenv_var __MODULES_LMEXTRATAG $c49mod1&bar&foo:$c49mod4&bar&foo
12791287
set ans [list]
12801288
lappend ans [list set __MODULES_LMEXTRATAG $c49lmextratag]
12811289
lappend ans [list set __MODULES_LMTAG $c49mod2&[join $c49mod2tag &]:$c49mod3&auto-loaded&keep-loaded&bar]
1282-
testouterr_cmd_re sh "restore $coll49fp" $ans {}
1290+
set tserr [msg_tag variant/3.0{bar=val2}]\n[msg_tag {tag/8.0{-bar:+foo} <foo:kL>}]\n[msg_tag {foo/1.0 <aL:bar:kL>}]\n[msg_tag keep/1.0]
1291+
testouterr_cmd sh "restore $coll49fp" $ans $tserr
12831292

12841293
unsetenv_var __MODULES_LMPREREQ
12851294
setenv_loaded_module [list $c49mod1 $c49mod2] [list $c49modpath1/$c49mod1 $c49modpath1/$c49mod2]
@@ -1292,13 +1301,13 @@ lappend ans [list set LOADEDMODULES $c49lm]
12921301
lappend ans [list set __MODULES_LMEXTRATAG $c49lmextratag]
12931302
lappend ans [list set __MODULES_LMTAG $c49mod2&[join $c49mod2tag &]:$c49mod3&bar&auto-loaded&keep-loaded]
12941303
set tserr [msg_load "$c49mod3 <aL:bar:kL>"]\n[msg_load $c49mod4]
1295-
testouterr_cmd_re sh "restore $coll49fp" $ans $tserr
1304+
testouterr_cmd sh "restore $coll49fp" $ans $tserr
12961305

12971306
# module-forbid defined in modulerc for 3rd collection module
12981307
setenv_var TESTSUITE_TAG_OPT coll49forb
12991308
setenv_var TESTSUITE_KEEP_LOADED coll49forb
13001309
set tserr [err_accessdenied $c49mod3]\n\n[msg_load $c49mod4 [err_accessdenied $c49mod3] [err_reqlo $c49mod3]]
1301-
testouterr_cmd_re sh "restore $coll49fp" ERR $tserr
1310+
testouterr_cmd sh "restore $coll49fp" ERR $tserr
13021311

13031312
unsetenv_var TESTSUITE_TAG_OPT
13041313
unsetenv_var TESTSUITE_KEEP_LOADED

0 commit comments

Comments
 (0)