ts: adapt tests for variantifspec val in avail_*output cfgs in 70/{220,360}

Author: xdelaruelle

testsuite/modules.70-maint/220-config.exp

@@ -159,8 +159,8 @@ array set configvalid [list\
     advanced_version_spec     {0 1}\
     auto_handling             {0 1}\
     avail_indepth             {0 1}\
-    avail_output              {modulepath alias dirwsym sym tag key variant}\
-    avail_terse_output        {modulepath alias dirwsym sym tag key variant}\
+    avail_output              {modulepath alias dirwsym sym tag key variant variantifspec}\
+    avail_terse_output        {modulepath alias dirwsym sym tag key variant variantifspec}\
     cache_buffer_bytes        {4096 1000000}\
     cache_expiry_secs         {0 31536000}\
     collection_pin_version    {0 1}\

testsuite/modules.70-maint/360-avail_output.exp

@@ -89,9 +89,9 @@ testouterr_cmd sh {ml -o sym -j foo/1.0} ERR "$error_msgs: Unsupported option '-
 
 # invalid value set
 set tserr_invalid_output_val "$error_msgs: Invalid element in value list for '--output' option on avail sub-command
-  Allowed elements are: modulepath alias dirwsym sym tag key variant (separated by ':')"
+  Allowed elements are: modulepath alias dirwsym sym tag key variant variantifspec (separated by ':')"
 set tserr_invalid_o_val "$error_msgs: Invalid element in value list for '-o' option on avail sub-command
-  Allowed elements are: modulepath alias dirwsym sym tag key variant (separated by ':')"
+  Allowed elements are: modulepath alias dirwsym sym tag key variant variantifspec (separated by ':')"
 testouterr_cmd sh {avail --output=foo foo} ERR $tserr_invalid_output_val
 testouterr_cmd sh {avail --output=sym,alias foo} ERR $tserr_invalid_output_val
 testouterr_cmd sh {avail --output="sym alias" foo} ERR $tserr_invalid_output_val
@@ -136,9 +136,9 @@ if {[cmpversion $tclsh_version 8.6] == -1} {
     testouterr_cmd_re sh {load output/1.0} ERR [escre [msg_load output/1.0 [msg_moderr {Missing value for '--output' option} {module unload --not-req --output bar<EXM>} $mp/output/1.0 3]]]
 
     setenv_var TESTSUITE_OUTPUT_INMODFILE 20
-    testouterr_cmd_re sh {load output/1.0} ERR [escre [msg_load output/1.0 [msg_moderr "Invalid element in value list for '--output' option on avail sub-command\nAllowed elements are: modulepath alias dirwsym sym tag key variant (separated by ':')" {module avail --output=header foo/1.0<EXM>} $mp/output/1.0 3]]]
+    testouterr_cmd_re sh {load output/1.0} ERR [escre [msg_load output/1.0 [msg_moderr "Invalid element in value list for '--output' option on avail sub-command\nAllowed elements are: modulepath alias dirwsym sym tag key variant variantifspec (separated by ':')" {module avail --output=header foo/1.0<EXM>} $mp/output/1.0 3]]]
     setenv_var TESTSUITE_OUTPUT_INMODFILE 21
-    testouterr_cmd_re sh {load output/1.0} ERR [escre [msg_load output/1.0 [msg_moderr "Invalid element in value list for '-o' option on avail sub-command\nAllowed elements are: modulepath alias dirwsym sym tag key variant (separated by ':')" {module avail -o sym,alias foo/1.0<EXM>} $mp/output/1.0 3]]]
+    testouterr_cmd_re sh {load output/1.0} ERR [escre [msg_load output/1.0 [msg_moderr "Invalid element in value list for '-o' option on avail sub-command\nAllowed elements are: modulepath alias dirwsym sym tag key variant variantifspec (separated by ':')" {module avail -o sym,alias foo/1.0<EXM>} $mp/output/1.0 3]]]
 
 } else {
 
@@ -165,9 +165,9 @@ if {[cmpversion $tclsh_version 8.6] == -1} {
     testouterr_cmd sh {load output/1.0} ERR [msg_load output/1.0 [msg_moderr {Missing value for '--output' option} {module unload --not-req --output bar} $mp/output/1.0 15]]
 
     setenv_var TESTSUITE_OUTPUT_INMODFILE 20
-    testouterr_cmd sh {load output/1.0} ERR [msg_load output/1.0 [msg_moderr "Invalid element in value list for '--output' option on avail sub-command\nAllowed elements are: modulepath alias dirwsym sym tag key variant (separated by ':')" {module avail --output=header foo/1.0} $mp/output/1.0 24]]
+    testouterr_cmd sh {load output/1.0} ERR [msg_load output/1.0 [msg_moderr "Invalid element in value list for '--output' option on avail sub-command\nAllowed elements are: modulepath alias dirwsym sym tag key variant variantifspec (separated by ':')" {module avail --output=header foo/1.0} $mp/output/1.0 24]]
     setenv_var TESTSUITE_OUTPUT_INMODFILE 21
-    testouterr_cmd sh {load output/1.0} ERR [msg_load output/1.0 [msg_moderr "Invalid element in value list for '-o' option on avail sub-command\nAllowed elements are: modulepath alias dirwsym sym tag key variant (separated by ':')" {module avail -o sym,alias foo/1.0} $mp/output/1.0 25]]
+    testouterr_cmd sh {load output/1.0} ERR [msg_load output/1.0 [msg_moderr "Invalid element in value list for '-o' option on avail sub-command\nAllowed elements are: modulepath alias dirwsym sym tag key variant variantifspec (separated by ':')" {module avail -o sym,alias foo/1.0} $mp/output/1.0 25]]
 }
 
 unsetenv_var TESTSUITE_OUTPUT_INMODFILE