ts: test --glob option on append/prepend-path

cea-hpc · Oct 3, 2023 · 0235002 · 0235002
1 parent 3f4d6f7
commit 0235002
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 0 deletions.
diff --git a/testsuite/modulefiles.4/append/1.0 b/testsuite/modulefiles.4/append/1.0
@@ -0,0 +1,2 @@
+#%Module
+append-path --glob FOO /tmp*
diff --git a/testsuite/modulefiles.4/append/2.0 b/testsuite/modulefiles.4/append/2.0
@@ -0,0 +1 @@
+#%Module
diff --git a/testsuite/modulefiles.4/prepend/1.0 b/testsuite/modulefiles.4/prepend/1.0
@@ -0,0 +1,2 @@
+#%Module
+prepend-path --glob FOO /tmp*
diff --git a/testsuite/modulefiles.4/prepend/2.0 b/testsuite/modulefiles.4/prepend/2.0
@@ -0,0 +1 @@
+#%Module
diff --git a/testsuite/modules.50-cmds/040-append.exp b/testsuite/modules.50-cmds/040-append.exp
@@ -412,6 +412,22 @@ lappend ans [list unset LOADEDMODULES]
 testouterr_cmd "sh" "unload $module" $ans {}
 
 
+#
+# --glob option
+#
+
+unsetenv_loaded_module
+unsetenv_path_var FOO
+setenv_var MODULEPATH $modpath.4
+
+set ans [list]
+lappend ans [list set FOO /tmp*]
+lappend ans [list set _LMFILES_ $modpath.4/append/1.0]
+lappend ans [list set LOADEDMODULES append/1.0]
+set tserr [msg_load append/1.0 "$warn_msgs: --glob option has no effect on append-path"]
+testouterr_cmd sh {load append/1.0} $ans $tserr
+
+
 #
 #  Cleanup
 #

diff --git a/testsuite/modules.50-cmds/050-prepend.exp b/testsuite/modules.50-cmds/050-prepend.exp
@@ -240,6 +240,22 @@ lappend ans [list set LOADEDMODULES $module]
 testouterr_cmd "sh" "load $module" $ans ""
 
 
+#
+# --glob option
+#
+
+unsetenv_loaded_module
+unsetenv_path_var FOO
+setenv_var MODULEPATH $modpath.4
+
+set ans [list]
+lappend ans [list set FOO /tmp*]
+lappend ans [list set _LMFILES_ $modpath.4/prepend/1.0]
+lappend ans [list set LOADEDMODULES prepend/1.0]
+set tserr [msg_load prepend/1.0 "$warn_msgs: --glob option has no effect on prepend-path"]
+testouterr_cmd sh {load prepend/1.0} $ans $tserr
+
+
 #
 #  Cleanup
 #

diff --git a/testsuite/modules.70-maint/150-append-path.exp b/testsuite/modules.70-maint/150-append-path.exp
@@ -166,6 +166,16 @@ testouterr_cmd sh {append-path FOO /tmp --prepend-on-unload /tmp} ERR [err_invop
 testouterr_cmd sh {append-path FOO /tmp --noop-on-unload /tmp} ERR [err_invopt --noop-on-unload]
 
 
+#
+# test --glob option usage
+#
+
+set ans [list]
+lappend ans [list set FOO $path1:/tmp*]
+set tserr "$warn_msgs: --glob option has no effect on append-path"
+testouterr_cmd sh {append-path --glob FOO /tmp*} $ans $tserr
+
+
 #
 #  Cleanup
 #

diff --git a/testsuite/modules.70-maint/151-prepend-path.exp b/testsuite/modules.70-maint/151-prepend-path.exp
@@ -256,6 +256,19 @@ testouterr_cmd sh {prepend-path FOO --prepend-on-unload /tmp} ERR [err_invopt --
 testouterr_cmd sh {prepend-path FOO --noop-on-unload /tmp} ERR [err_invopt --noop-on-unload]
 
 
+#
+# test --glob option usage
+#
+
+setenv_var FOO $path1
+unsetenv_var __MODULES_SHARE_FOO
+
+set ans [list]
+lappend ans [list set FOO /tmp*:$path1]
+set tserr "$warn_msgs: --glob option has no effect on prepend-path"
+testouterr_cmd sh {prepend-path --glob FOO /tmp*} $ans $tserr
+
+
 #
 #  Cleanup
 #