ts: adapt for provided-alias addition to {avail,spider}_output

Signed-off-by: Xavier Delaruelle <[email protected]>

Author: xdelaruelle

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

@@ -191,8 +191,8 @@ array set configvalid [list\
     advanced_version_spec     {0 1}\
     auto_handling             {0 1}\
     avail_indepth             {0 1}\
-    avail_output              {modulepath alias dirwsym indesym sym tag key hidden variant variantifspec via}\
-    avail_terse_output        {modulepath alias dirwsym indesym sym tag key hidden variant variantifspec}\
+    avail_output              {modulepath alias provided-alias dirwsym indesym sym tag key hidden variant variantifspec via}\
+    avail_terse_output        {modulepath alias provided-alias dirwsym indesym sym tag key hidden variant variantifspec}\
     cache_buffer_bytes        {4096 1000000}\
     cache_expiry_secs         {0 31536000}\
     collection_pin_version    {0 1}\
@@ -222,8 +222,8 @@ array set configvalid [list\
     silent_shell_debug        {0 1}\
     source_cache              {0 1}\
     spider_indepth            {0 1}\
-    spider_output             {modulepath alias dirwsym indesym sym tag key hidden variant variantifspec via}\
-    spider_terse_output       {modulepath alias dirwsym indesym sym tag key hidden variant variantifspec}\
+    spider_output             {modulepath alias provided-alias dirwsym indesym sym tag key hidden variant variantifspec via}\
+    spider_terse_output       {modulepath alias provided-alias dirwsym indesym sym tag key hidden variant variantifspec}\
     sticky_purge              {error warning silent}\
     term_background           {dark light}\
     term_width                {0 1000}\

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 indesym sym tag key hidden variant variantifspec via (separated by ':')"
+  Allowed elements are: modulepath alias provided-alias dirwsym indesym sym tag key hidden variant variantifspec via (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 indesym sym tag key hidden variant variantifspec via (separated by ':')"
+  Allowed elements are: modulepath alias provided-alias dirwsym indesym sym tag key hidden variant variantifspec via (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 indesym sym tag key hidden variant variantifspec via (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 provided-alias dirwsym indesym sym tag key hidden variant variantifspec via (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 indesym sym tag key hidden variant variantifspec via (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 provided-alias dirwsym indesym sym tag key hidden variant variantifspec via (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 indesym sym tag key hidden variant variantifspec via (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 provided-alias dirwsym indesym sym tag key hidden variant variantifspec via (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 indesym sym tag key hidden variant variantifspec via (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 provided-alias dirwsym indesym sym tag key hidden variant variantifspec via (separated by ':')" {module avail -o sym,alias foo/1.0} $mp/output/1.0 25]]
 }
 
 unsetenv_var TESTSUITE_OUTPUT_INMODFILE
@@ -521,7 +521,7 @@ $modpath.spider1:
 moda/1 <L>
 moda/2"
 testouterr_cmd sh {avail -t mod} OK $tserr
-testouterr_cmd sh {avail -t -o +via mod} ERR "$error_msgs: Invalid element in value list for '-o' option on avail sub-command\n  Allowed elements are: modulepath alias dirwsym indesym sym tag key hidden variant variantifspec (separated by ':')"
+testouterr_cmd sh {avail -t -o +via mod} ERR "$error_msgs: Invalid element in value list for '-o' option on avail sub-command\n  Allowed elements are: modulepath alias provided-alias dirwsym indesym sym tag key hidden variant variantifspec (separated by ':')"
 
 # same module in different modulepath, one of them loaded
 setenv_var MODULES_AVAIL_OUTPUT sym:tag:modulepath:via

testsuite/modules.70-maint/362-spider_output.exp

@@ -75,9 +75,9 @@ testouterr_cmd sh {--json ml spi -o sym foo/1.0} ERR "{\"errors\": \[\n{ \"sever
 
 # invalid value set
 set tserr_invalid_output_val "$error_msgs: Invalid element in value list for '--output' option on spider sub-command
-  Allowed elements are: modulepath alias dirwsym indesym sym tag key hidden variant variantifspec via (separated by ':')"
+  Allowed elements are: modulepath alias provided-alias dirwsym indesym sym tag key hidden variant variantifspec via (separated by ':')"
 set tserr_invalid_o_val "$error_msgs: Invalid element in value list for '-o' option on spider sub-command
-  Allowed elements are: modulepath alias dirwsym indesym sym tag key hidden variant variantifspec via (separated by ':')"
+  Allowed elements are: modulepath alias provided-alias dirwsym indesym sym tag key hidden variant variantifspec via (separated by ':')"
 testouterr_cmd sh {spider --output=foo foo} ERR $tserr_invalid_output_val
 testouterr_cmd sh {spider --output=sym,alias foo} ERR $tserr_invalid_output_val
 testouterr_cmd sh {spider --output="sym alias" foo} ERR $tserr_invalid_output_val
@@ -490,7 +490,7 @@ $modpath.spider3:
 modc/1
 modc/2"
 testouterr_cmd sh {spider -t mod} OK $tserr
-testouterr_cmd sh {spider -t -o +via mod} ERR "$error_msgs: Invalid element in value list for '-o' option on spider sub-command\n  Allowed elements are: modulepath alias dirwsym indesym sym tag key hidden variant variantifspec (separated by ':')"
+testouterr_cmd sh {spider -t -o +via mod} ERR "$error_msgs: Invalid element in value list for '-o' option on spider sub-command\n  Allowed elements are: modulepath alias provided-alias dirwsym indesym sym tag key hidden variant variantifspec (separated by ':')"
 
 # same module in different modulepath, one of them loaded
 setenv_var MODULES_SPIDER_OUTPUT sym:tag:modulepath:via