ts: test module designation with tags when loading

cea-hpc · May 6, 2022 · 8523c2d · 8523c2d
1 parent 9166019
commit 8523c2d
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 1 deletion.
diff --git a/testsuite/modules.50-cmds/465-tag-opt.exp b/testsuite/modules.50-cmds/465-tag-opt.exp
@@ -1263,6 +1263,31 @@ unsetenv_var TESTSUITE_KEEP_LOADED
 unsetenv_var MODULES_ADVANCED_VERSION_SPEC
 
 
+# test module designation rendering with tags when module evaluation fails
+setenv_var TESTSUITE_TAG_OPT prtagbad2
+set ln [expr {[cmpversion $tclsh_version 8.6] == -1 ? 5 : 71}]
+set tserr [escre [msg_load $mod [msg_moderr {wrong # args: should be "prereq ?--tag? ?taglist? modulefile ?...?"} {prereq --tag<EXM>} $modfile $ln]]]
+testouterr_cmd_re sh "load --tag=foo $mod" ERR $tserr
+unsetenv_var TESTSUITE_TAG_OPT
+
+# test module designation rendering with tags when module is already loaded
+setenv_loaded_module [list $mod] [list $modfile]
+setenv_var __MODULES_LMTAG $mod&bar
+set tserr [msg_load "$mod <bar>" [info_alreadyloaded $mod]]
+testouterr_cmd sh "load -vv $mod" OK $tserr
+
+set ans [list]
+lappend ans [list set __MODULES_LMEXTRATAG $mod&foo]
+lappend ans [list set __MODULES_LMTAG $mod&bar&foo]
+#FIXME: already loaded message printed in verbose2 mode prior Tagging message (with un-updated list of tags)
+set tserr [msg_load "$mod <bar>" [info_alreadyloaded $mod]]\n\n[msg_tag "$mod <bar:foo>"]
+testouterr_cmd sh "load -vv --tag=foo $mod" $ans $tserr
+
+unsetenv_loaded_module
+unsetenv_var __MODULES_LMTAG
+unsetenv_var MODULES_COLORS
+
+
 #
 #  Cleanup
 #

diff --git a/testsuite/modules.70-maint/321-tag_abbrev.exp b/testsuite/modules.70-maint/321-tag_abbrev.exp
@@ -50,6 +50,10 @@ lappend ans [list set LOADEDMODULES tag/5.0]
 lappend ans [list set __MODULES_LMTAG tag/5.0&foo&BaR]
 testouterr_cmd sh {load tag/5.0} $ans {}
 
+# test module designation when loading
+set tserr [msg_load {tag/5.0 <BaR:F>}]
+testouterr_cmd sh {load -v tag/5.0} $ans $tserr
+
 # test with tag/5.0 loaded
 setenv_loaded_module [list tag/5.0] [list $mp/tag/5.0]
 setenv_var __MODULES_LMTAG tag/5.0&foo&BaR

diff --git a/testsuite/modules.70-maint/322-tag-sgr.exp b/testsuite/modules.70-maint/322-tag-sgr.exp
@@ -12,7 +12,7 @@
 #   Description:	Testuite testsequence
 #   Command:
 #   Modulefiles:    tag
-#   Sub-Command:    avail, list
+#   Sub-Command:    load, avail, list
 #
 #   Comment:	%C{
 #           Test tag report rendering with SGR
@@ -305,6 +305,58 @@ unsetenv_loaded_module
 unsetenv_var __MODULES_LMTAG
 
 
+# test sgr rendering over module designation when loading
+setenv TESTSUITE_MODULE_TAG_SET1 1
+setenv_var MODULES_TAG_ABBREV foo=F
+setenv_var MODULES_COLORS {F=42}
+set ans [list]
+lappend ans [list set _LMFILES_ $mp/tag/5.0]
+lappend ans [list set LOADEDMODULES tag/5.0]
+lappend ans [list set __MODULES_LMTAG tag/5.0&foo]
+set tserr [msg_load [sgr 42]tag/5.0[sgr 0]]
+testouterr_cmd_re sh {load -v tag/5.0} $ans $tserr
+
+setenv_var MODULES_COLORS {F=42:hi=1}
+set tserr [msg_load [sgr {42;1}]tag/5.0[sgr 0]]
+testouterr_cmd_re sh {load -v tag/5.0} $ans $tserr
+
+# test sgr rendering along module designation when loading
+setenv_var MODULES_COLORS {F=42}
+setenv_var MODULES_TAG_COLOR_NAME F
+set tserr [msg_load "tag/5.0 <[sgr 42]F[sgr 0]>"]
+testouterr_cmd_re sh {load -v tag/5.0} $ans $tserr
+
+setenv_var MODULES_COLORS {F=42:hi=1}
+set tserr [msg_load "[sgr 1]tag/5.0[sgr 22] <[sgr 42]F[sgr 0]>"]
+testouterr_cmd_re sh {load -v tag/5.0} $ans $tserr
+
+unsetenv_var MODULES_TAG_COLOR_NAME
+unsetenv TESTSUITE_MODULE_TAG_SET1
+unsetenv_var MODULES_TAG_ABBREV
+
+
+# test module designation rendering with tags when module is already loaded
+setenv_loaded_module [list tag/8.0] [list $mp/tag/8.0]
+setenv_var __MODULES_LMTAG tag/8.0&bar
+
+setenv_var MODULES_COLORS bar=42
+set ans [list]
+lappend ans [list set __MODULES_LMEXTRATAG tag/8.0&foo]
+lappend ans [list set __MODULES_LMTAG tag/8.0&bar&foo]
+#FIXME: already loaded message printed in verbose2 mode prior Tagging message (with un-updated list of tags)
+set tserr [msg_load [sgr 42]tag/8.0[sgr 0] [info_alreadyloaded tag/8.0]]\n\n[msg_tag "[sgr 42]tag/8.0[sgr 0] <foo>"]
+testouterr_cmd_re sh "load -vv --tag=foo tag/8.0" $ans $tserr
+setenv_var MODULES_COLORS bar=42:hi=1
+#FIXME: already loaded message printed in verbose2 mode prior Tagging message (with un-updated list of tags)
+set tserr [msg_load [sgr {42;1}]tag/8.0[sgr 0] [info_alreadyloaded tag/8.0]]\n\n[msg_tag "[sgr {42;1}]tag/8.0[sgr 0] <foo>"]
+testouterr_cmd_re sh "load -vv --tag=foo tag/8.0" $ans $tserr
+setenv_var MODULES_COLORS bar=42:foo=44:hi=1
+
+unsetenv_loaded_module
+unsetenv_var __MODULES_LMTAG
+unsetenv_var MODULES_COLORS
+
+
 #
 #  Cleanup
 #