ts: test -o/--output value append/subtract in 70/36{0,1}

Author: xdelaruelle

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

@@ -347,6 +347,44 @@ foo/0.load
 foo/0.prereq"
 
 
+#
+# -o/--output append/subtract tests
+#
+
+set mp $modpath.3
+set mpre [regsub -all "\(\[.+?\]\)" $mp {\\\1}]
+setenv_path_var MODULEPATH $mp
+unsetenv_var MODULES_AVAIL_OUTPUT
+unsetenv_var MODULES_AVAIL_TERSE_OUTPUT
+
+setenv_var TESTSUITE_VARIANT 1
+
+testouterr_cmd sh {avail -o +variant --terse variant/1.0} OK $mp:\nvariant/1.0{foo=val1}
+testouterr_cmd sh {avail --output=+variant --terse variant/1.0} OK $mp:\nvariant/1.0{foo=val1}
+testouterr_cmd sh {avail -o -modulepath --terse variant/1.0} OK variant/1.0
+testouterr_cmd sh {avail --output=-modulepath:sym:tag --terse foo/0.2} OK foo/0.2
+testouterr_cmd sh {avail --output=-modulepath:sym:tag foo/0.2} OK {foo/0.2  }
+
+testouterr_cmd sh {avail --output=-sym: foo/0.2} ERR $tserr_invalid_output_val
+testouterr_cmd sh {avail --output=+foo: foo/0.2} ERR $tserr_invalid_output_val
+testouterr_cmd sh {avail -o +:variant foo/0.2} ERR $tserr_invalid_o_val
+testouterr_cmd sh {avail -o -bar foo/0.2} ERR $tserr_invalid_o_val
+
+set tserr "$modlin $mpre $modlin
+foo/0.2\\(sym\\) <tag>  
+
+Key:
+\\(symbolic-version\\)  <module-tag>  "
+testouterr_cmd_re sh {avail -o +tag:sym foo/0.2} OK $tserr
+
+setenv_var MODULES_AVAIL_OUTPUT sym:tag
+setenv_var MODULES_AVAIL_TERSE_OUTPUT sym:tag
+
+testouterr_cmd sh {avail --output=+variant --terse variant/1.0} OK variant/1.0{foo=val1}
+testouterr_cmd sh {avail --output=+variant --terse foo/0.2} OK {foo/0.2(sym) <tag>}
+testouterr_cmd sh {avail -o -modulepath:sym:tag foo/0.2} OK {foo/0.2  }
+
+
 #
 #  Cleanup
 #

testsuite/modules.70-maint/361-list_output.exp

@@ -243,6 +243,38 @@ unsetenv_var MODULES_LIST_TERSE_OUTPUT
 unsetenv_var __MODULES_LMTAG
 
 
+#
+# -o/--output append/subtract tests
+#
+
+setenv_var __MODULES_LMTAG foo/1.0&baz
+unsetenv_var MODULES_LIST_OUTPUT
+unsetenv_var MODULES_LIST_TERSE_OUTPUT
+
+testouterr_cmd sh {list --output=-tag:key} OK "$cur_loaded\n 1) foo/1.0(bar)  "
+testouterr_cmd sh {list -o -sym:key} OK "$cur_loaded\n 1) foo/1.0 <baz>  "
+
+testouterr_cmd sh {list -t -o +sym} OK "$cur_loaded\nfoo/1.0(bar)"
+testouterr_cmd sh {list -t --output=+tag} OK "$cur_loaded\nfoo/1.0 <baz>"
+testouterr_cmd sh {list -t --output=+tag:sym} OK "$cur_loaded\nfoo/1.0(bar) <baz>"
+
+testouterr_cmd sh {list --output=-sym:} ERR $tserr_invalid_output_val
+testouterr_cmd sh {list -o -bar --terse} ERR $tserr_invalid_o_val
+
+setenv_var MODULES_LIST_OUTPUT tag
+setenv_var MODULES_LIST_TERSE_OUTPUT {}
+
+testouterr_cmd sh {list -o +sym} OK "foo/1.0(bar) <baz>  "
+testouterr_cmd sh {list --output=-sym:tag} OK "foo/1.0  "
+
+testouterr_cmd sh {list -t -o -sym} OK "foo/1.0"
+testouterr_cmd sh {list -t --output=+sym} OK "foo/1.0(bar)"
+testouterr_cmd sh {list -t -o +sym:tag} OK "foo/1.0(bar) <baz>"
+
+testouterr_cmd sh {--output=+bar list} ERR $tserr_invalid_output_val
+testouterr_cmd sh {-t list -o -:sym} ERR $tserr_invalid_o_val
+
+
 #
 #  Cleanup
 #