Fix 'module load a b' in modfiles when a or b is loaded

Fix automatic loading of modulefiles when multiple module names are set on a single ``module load`` modulefile command. When auto_handling mode was disabled, the load of not loaded modules was not achieved as soon as some modules on this list were already loaded. Fixes cea-hpc#281.
xdelaruelle · Jul 8, 2019 · 27abbbe · 27abbbe
1 parent 4016696
commit 27abbbe
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 6 deletions.
diff --git a/modulecmd.tcl.in b/modulecmd.tcl.in
@@ -1850,12 +1850,19 @@ proc module {command args} {
                   # load here if no auto mode, done through prereq elsewhere
                   # inhibited if currently in DepRe context
                   if {![getAutoHandling] && [currentModuleEvalContext] ne\
-                     {depre} && ![eval is-loaded $args] && ![eval is-loading\
-                     $args]} {
-                     set ret [eval cmdModuleLoad reqlo 0 $args]
-                     # ignore obtained error if force mode enabled
-                     if {[getForce]} {
-                        set ret 0
+                     {depre}} {
+                     # attempt load of not already loaded modules
+                     foreach arg $args {
+                        if {![is-loaded $arg] && ![is-loading $arg]} {
+                           lappend modlist $arg
+                        }
+                     }
+                     if {[info exists modlist]} {
+                        set ret [eval cmdModuleLoad reqlo 0 $modlist]
+                        # ignore obtained error if force mode enabled
+                        if {[getForce]} {
+                           set ret 0
+                        }
                      }
                   }
                   # register modulefiles to load as individual prereqs

diff --git a/testsuite/modulefiles.deps/m10 b/testsuite/modulefiles.deps/m10
@@ -0,0 +1 @@
+#%Module
diff --git a/testsuite/modulefiles.deps/m11 b/testsuite/modulefiles.deps/m11
@@ -0,0 +1 @@
+#%Module
diff --git a/testsuite/modulefiles.deps/m12 b/testsuite/modulefiles.deps/m12
@@ -0,0 +1,2 @@
+#%Module
+module load m10 m11
diff --git a/testsuite/modules.50-cmds/376-deps7.exp b/testsuite/modules.50-cmds/376-deps7.exp
@@ -197,6 +197,42 @@ set tserr [list {load m7} \n[msg_load m7 "$err_path'm8'" [err_reqlof m8]]]
 testouterr_cmd_re sh {load --force --auto m7} $ans [join $tserr \n]
 testouterr_cmd_re sh {load --force --no-auto m7} $ans [join $tserr \n]
 
+# load test where 'module load' has multiple module args
+set ans [list]
+lappend ans [list setpath LOADEDMODULES m10:m11:m12]
+lappend ans [list setpath _LMFILES_ $mp/m10:$mp/m11:$mp/m12]
+lappend ans [list setpath MODULES_LMPREREQ m12&m10&m11]
+lappend ans [list setpath MODULES_LMNOTUASKED m10:m11]
+set tserr [list [msg_top_load m12 {} {m10 m11} {}]]
+testouterr_cmd_re sh {load --auto m12} $ans [join $tserr \n]
+testouterr_cmd_re sh {load --no-auto m12} $ans [join $tserr \n]
+setenv_loaded_module [list m10] [list $mp/m10]
+set ans [list]
+lappend ans [list setpath LOADEDMODULES m10:m11:m12]
+lappend ans [list setpath _LMFILES_ $mp/m10:$mp/m11:$mp/m12]
+lappend ans [list setpath MODULES_LMPREREQ m12&m10&m11]
+lappend ans [list setpath MODULES_LMNOTUASKED m11]
+set tserr [list [msg_top_load m12 {} {m11} {}]]
+testouterr_cmd_re sh {load --auto m12} $ans [join $tserr \n]
+testouterr_cmd_re sh {load --no-auto m12} $ans [join $tserr \n]
+setenv_loaded_module [list m11] [list $mp/m11]
+set ans [list]
+lappend ans [list setpath LOADEDMODULES m11:m10:m12]
+lappend ans [list setpath _LMFILES_ $mp/m11:$mp/m10:$mp/m12]
+lappend ans [list setpath MODULES_LMPREREQ m12&m10&m11]
+lappend ans [list setpath MODULES_LMNOTUASKED m10]
+set tserr [list [msg_top_load m12 {} {m10} {}]]
+testouterr_cmd_re sh {load --auto m12} $ans [join $tserr \n]
+testouterr_cmd_re sh {load --no-auto m12} $ans [join $tserr \n]
+setenv_loaded_module [list m10 m11] [list $mp/m10 $mp/m11]
+set ans [list]
+lappend ans [list setpath LOADEDMODULES m10:m11:m12]
+lappend ans [list setpath _LMFILES_ $mp/m10:$mp/m11:$mp/m12]
+lappend ans [list setpath MODULES_LMPREREQ m12&m10&m11]
+set tserr {}
+testouterr_cmd_re sh {load --auto m12} $ans [join $tserr \n]
+testouterr_cmd_re sh {load --no-auto m12} $ans [join $tserr \n]
+
 
 #
 # 'module unload' tests