ts: test one variant set multiple times for EMS

Author: xdelaruelle

testsuite/modules.51-scan/030-scan_eval-avail.exp

@@ -615,6 +615,19 @@ testouterr_cmd sh {avail -t diralscan foo=val2} OK {}
 testouterr_cmd sh {avail -t diralscan/1.0 foo=val2} OK {}
 
 
+#
+# same variant specified several times
+#
+
+setenv_var TESTSUITE_SCAN variant1
+
+set tserr "scan/2.0{foo=val1,val2,val3}
+scan/2.1{foo=val1,val2,val3}"
+testouterr_cmd sh {avail -t scan foo=val1 foo=val2} OK $tserr
+testouterr_cmd sh {avail -t scan foo=val1 foo=val4 foo=val2} OK {}
+testouterr_cmd sh {avail -t scan foo=val2 foo=val4} OK {}
+
+
 #
 #  Cleanup
 #

testsuite/modules.51-scan/031-scan_eval-whatis.exp

@@ -408,6 +408,20 @@ if {[info exists env(TESTSUITE_ENABLE_MODULECACHE)]} {
 }
 
 
+#
+# same variant specified several times
+#
+
+setenv_var TESTSUITE_SCAN variant1
+
+set tserr "$modlin $mpre $modlin
+\\s+scan/2.0: scan/2.0
+\\s+scan/2.1: scan/2.1"
+testouterr_cmd_re sh {whatis scan foo=val1 foo=val2} OK $tserr
+testouterr_cmd_re sh {whatis scan foo=val1 foo=val4 foo=val2} ERR "$err_path'scan foo=val1 foo=val4 foo=val2'"
+testouterr_cmd_re sh {whatis scan foo=val2 foo=val4} ERR "$err_path'scan foo=val2 foo=val4'"
+
+
 #
 #  Cleanup
 #

testsuite/modules.51-scan/032-scan_eval-paths.exp

@@ -360,6 +360,19 @@ if {[info exists env(TESTSUITE_ENABLE_MODULECACHE)]} {
 }
 
 
+#
+# same variant specified several times
+#
+
+setenv_var TESTSUITE_SCAN variant1
+
+set ans [list]
+lappend ans [list text $mp/scan/2.0]
+testouterr_cmd sh {paths scan foo=val1 foo=val2} $ans {}
+testouterr_cmd sh {paths scan foo=val1 foo=val4 foo=val2} OK {}
+testouterr_cmd sh {paths scan foo=val2 foo=val4} OK {}
+
+
 #
 #  Cleanup
 #

testsuite/modules.51-scan/040-extra_spec.exp

@@ -161,7 +161,9 @@ setenv_var TESTSUITE_EXTRA vr1
 set tserr extra/1.0
 testouterr_cmd sh {avail -t extra xtfoo=val2 variant:xtbar} OK $tserr
 testouterr_cmd sh {avail -t extra xtfoo=val2 variant:xtfoo} OK $tserr
+testouterr_cmd sh {avail -t extra xtfoo=val2 xtfoo=val1 variant:xtfoo} OK $tserr
 testouterr_cmd sh {avail -t extra xtfoo=val5 variant:xtfoo} OK {}
+testouterr_cmd sh {avail -t extra xtfoo=val5 xtfoo=val2 variant:xtfoo} OK {}
 testouterr_cmd sh {avail -t extra xtfoo=val2 variant:unk} OK {}
 testouterr_cmd sh {avail -t extra xtfoo=val5 variant:unk} OK {}
 testouterr_cmd sh {avail -t xtfoo=val2 variant:xtbar} OK $tserr

testsuite/modules.70-maint/370-variant.exp

@@ -393,8 +393,13 @@ set tserr "$modlin $mpre $modlin\nvariant/6.0{bar=1,2,3:foo=val1,val2,val3}  "
 testouterr_cmd_re sh {avail [email protected] foo=val1 baz=2} OK {}
 testouterr_cmd_re sh {avail [email protected] foo=val4 bar=1} OK {}
 testouterr_cmd_re sh {avail [email protected] foo=val4} OK {}
+testouterr_cmd_re sh {avail [email protected] foo=val4 foo=val1} OK {}
 testouterr_cmd_re sh {avail [email protected] baz=3} OK {}
+testouterr_cmd_re sh {avail [email protected] foo=val1 foo=val2} OK $tserr
 testouterr_cmd_re sh {avail [email protected] foo=val1 bar=2} OK $tserr
+testouterr_cmd_re sh {avail [email protected] foo=val1 bar=2 bar=1} OK $tserr
+testouterr_cmd_re sh {avail [email protected] foo=val1 bar=2 bar=4} OK {}
+testouterr_cmd_re sh {avail [email protected] foo=val1 bar=4 bar=1} OK {}
 testouterr_cmd_re sh {avail [email protected] foo=val1 bar=1} OK $tserr
 testouterr_cmd_re sh {avail [email protected] foo=val1} OK $tserr
 setenv_var MODULES_AVAIL_OUTPUT {modulepath:alias:dirwsym:sym:tag}

testsuite/modules.70-maint/375-variant-whatis.exp

@@ -33,8 +33,10 @@ setenv_var TESTSUITE_VARIANT 1
 set tserr "$modlin $mpre $modlin
 \\s+variant/6.0: variant/6.0"
 testouterr_cmd_re sh {whatis variant/6.0 foo=val1 bar=2} OK $tserr
+testouterr_cmd_re sh {whatis variant/6.0 foo=val3 foo=val1 bar=2} OK $tserr
 testouterr_cmd_re sh {whatis variant/6.0} OK $tserr
 testouterr_cmd_re sh {whatis variant/6.0 unk=val} ERR "$err_path'variant/6.0 unk=val'"
+testouterr_cmd_re sh {whatis variant/6.0 foo=val4 foo=val1 bar=2} ERR "$err_path'variant/6.0 foo=val4 foo=val1 bar=2'"
 
 testouterr_cmd_re sh {search variant} OK $tserr
 testouterr_cmd_re sh {search variant/6.0} OK $tserr