diff --git a/easybuild/tools/modules.py b/easybuild/tools/modules.py index 2d0d949f1c..20bb9104b2 100644 --- a/easybuild/tools/modules.py +++ b/easybuild/tools/modules.py @@ -677,7 +677,7 @@ def set_and_check_version(self): """Get the module version, and check any requirements""" # 'lmod python update' needs to be run after changing $MODULEPATH - self.run_module('update') + #self.run_module('update') super(Lmod, self).set_and_check_version() @@ -706,7 +706,10 @@ def available(self, mod_name=None): def update(self): """Update after new modules were added.""" - spider_cmd = os.path.join(os.path.dirname(self.cmd), 'spider') + + return + + spider_cmd = os.path.join(os.path.dirname(self.cmd), 'spider') cmd = [spider_cmd, '-o', 'moduleT', os.environ['MODULEPATH']] self.log.debug("Running command '%s'..." % ' '.join(cmd)) proc = subprocess.Popen(cmd, stdout=PIPE, stderr=PIPE, env=os.environ) diff --git a/test/framework/modules.py b/test/framework/modules.py index ef970e0abd..357692b75c 100644 --- a/test/framework/modules.py +++ b/test/framework/modules.py @@ -240,8 +240,11 @@ def suite(): if __name__ == '__main__': main(exit=False) + gt = 0 for subcmd in sorted(MODULE_SUBCMD_TIMINGS.keys()): total = sum(MODULE_SUBCMD_TIMINGS[subcmd]) + gt += total cnt = len(MODULE_SUBCMD_TIMINGS[subcmd]) if cnt > 0: - print "avg time (in secs) for %s: %s (cnt: %s)" % (subcmd, total/cnt, cnt) + print "avg time (in secs) for %9s: %8.4f (cnt: %3d, total: %7.3f)" % (subcmd, total/cnt, cnt, total) + print "total module time: ", gt