ts: test hidden-loaded tag on 70/{320,322} and 90/100

This commit is contained in:
Xavier Delaruelle
2020-12-15 13:39:53 +01:00
parent 1a1a6b7ce4
commit 49c201be89
4 changed files with 39 additions and 2 deletions

View File

@@ -117,3 +117,9 @@ if {[info exists env(TESTSUITE_MODULE_TAG_SET12)]} {
module-tag LoO tag/tagtag
module-tag K tag/tagtag
}
if {[info exists env(TESTSUITE_MODULE_TAG_SET13)]} {
module-hide --soft --hidden-loaded tag/5.0
}
if {[info exists env(TESTSUITE_MODULE_TAG_SET14)]} {
module-hide --hidden-loaded tag/5.0
}

View File

@@ -108,8 +108,8 @@ testouterr_cmd sh {unload tag/4.0} $ans {}
# list tests
#
setenv_loaded_module [list tag/4.0 tag/2.0] [list $mp/tag/4.0 $mp/tag/1.0]
setenv_path_var MODULES_LMTAG tag/4.0&nearly-forbidden&othertag:tag/2.0&forbidden
setenv_loaded_module [list tag/4.0 tag/2.0 tag/5.0] [list $mp/tag/4.0 $mp/tag/1.0 $mp/tag/5.0]
setenv_path_var MODULES_LMTAG tag/4.0&nearly-forbidden&othertag:tag/2.0&forbidden:tag/5.0&hidden-loaded
testouterr_cmd sh {list} OK "$cur_loaded
1) tag/4.0 <nF:othertag> 2) tag/2.0 <F> "
@@ -129,6 +129,15 @@ set tserr "{\"tag/4.0\": { \"name\": \"tag/4.0\", \"type\": \"modulefile\", \"sy
\"tag/2.0\": { \"name\": \"tag/2.0\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[ \"forbidden\" \], \"pathname\": \"$mp/tag/1.0\"}}"
testouterr_cmd sh {list -j} OK $tserr
# display hidden entries
testouterr_cmd sh {list -a} OK "$cur_loaded
1) tag/4.0 <nF:othertag> 2) tag/2.0 <F> 3) tag/5.0 <H> "
set tserr "{\"tag/4.0\": { \"name\": \"tag/4.0\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[ \"nearly-forbidden\", \"othertag\" \], \"pathname\": \"$mp/tag/4.0\"},
\"tag/2.0\": { \"name\": \"tag/2.0\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[ \"forbidden\" \], \"pathname\": \"$mp/tag/1.0\"},
\"tag/5.0\": { \"name\": \"tag/5.0\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[ \"hidden-loaded\" \], \"pathname\": \"$mp/tag/5.0\"}}"
testouterr_cmd sh {list -j --all} OK $tserr
unsetenv_loaded_module
unsetenv_path_var MODULES_LMTAG
unset tomorrow

View File

@@ -252,6 +252,16 @@ setenv_var MODULES_TAG_COLOR_NAME I:D:IiI
testerr_cmd_re sh {avail -t} ".*[sgr {41}]t[sgr {0;42}]a[sgr {0;43}]g[sgr {0;45}]/[sgr {0;46}]t[sgr {0;47}]a[sgr {0;101}]g[sgr {0;103}]t[sgr {0;104}]ag[sgr {0}] <[sgr {44}]D[sgr {0}]:[sgr {102}]IiI[sgr {0}]>.*"
unsetenv_var TESTSUITE_MODULE_TAG_SET11
# test hidden-loaded sgr on list
setenv_loaded_module [list tag/5.0] [list $mp/tag/5.0]
setenv_path_var MODULES_LMTAG tag/5.0&hidden-loaded
setenv_var MODULES_TAG_ABBREV hidden-loaded=H
setenv_var MODULES_COLORS {aL=100:al=96:de=4:H=2}
testouterr_cmd_re sh {list -a} OK "$cur_loaded
1\\\) [sgr 2]tag/5.0[sgr 0] "
unsetenv_loaded_module
unsetenv_path_var MODULES_LMTAG
#
# Cleanup

View File

@@ -133,6 +133,18 @@ set tserr "{\"$mp\": {
}}"
testouterr_cmd sh {avail -j tag/3.0} OK $tserr
# test hidden-loaded tag that should not be reported on avail
setenv_var MODULES_TAG_ABBREV {auto-loaded=aL:loaded=L:hidden=H:hidden-loaded=Hl:forbidden=F:nearly-forbidden=nF}
setenv_var TESTSUITE_MODULE_TAG_SET13 1
set tserr "$modlin $mpre $modlin
tag/5.0 "
testouterr_cmd_re sh {avail tag/5.0} OK $tserr
unsetenv_var TESTSUITE_MODULE_TAG_SET13
setenv_var TESTSUITE_MODULE_TAG_SET14 1
set tserr "$modlin $mpre $modlin
tag/5.0 <H> "
testouterr_cmd_re sh {avail tag/5.0} OK $tserr
unsetenv_var TESTSUITE_MODULE_TAG_SET14
#
# Cleanup