diff options
| author | Massimiliano Culpo <massimiliano.culpo@googlemail.com> | 2017-02-11 01:09:43 +0100 |
|---|---|---|
| committer | becker33 <becker33@llnl.gov> | 2017-02-10 16:09:43 -0800 |
| commit | e24fdb49ea92fe310d5a39e610821bf0e51be8b1 (patch) | |
| tree | f3a7714c007882b5e394c8f446bda86f92e3b392 /lib | |
| parent | cbbf5791bade31cfaab0da9104582955eead5411 (diff) | |
| download | spack-e24fdb49ea92fe310d5a39e610821bf0e51be8b1.tar.gz spack-e24fdb49ea92fe310d5a39e610821bf0e51be8b1.tar.bz2 spack-e24fdb49ea92fe310d5a39e610821bf0e51be8b1.tar.xz spack-e24fdb49ea92fe310d5a39e610821bf0e51be8b1.zip | |
fix: don't call setup_environment when not needed (#3060)
* Don't call setup_environment when not needed. fixes #3059
* setup_environment and modules: added unit tests
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/modules.py | 1 | ||||
| -rw-r--r-- | lib/spack/spack/package.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/test/modules.py | 15 |
3 files changed, 16 insertions, 2 deletions
diff --git a/lib/spack/spack/modules.py b/lib/spack/spack/modules.py index 885f2197ef..a6ffded935 100644 --- a/lib/spack/spack/modules.py +++ b/lib/spack/spack/modules.py @@ -389,7 +389,6 @@ class EnvModule(object): for mod in modules: set_module_variables_for_package(package, mod) set_module_variables_for_package(package, package.module) - package.setup_environment(spack_env, env) package.setup_dependent_package(self.pkg.module, self.spec) package.setup_dependent_environment(spack_env, env, self.spec) diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index e5ea8c56ad..361691379e 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -1452,7 +1452,7 @@ class PackageBase(object): This is useful if there are some common steps to installing all extensions for a certain package. """ - self.setup_environment(spack_env, run_env) + pass def setup_dependent_package(self, module, dependent_spec): """Set up Python module-scope variables for dependent packages. diff --git a/lib/spack/spack/test/modules.py b/lib/spack/spack/test/modules.py index 4f35df1982..bb1b0006f8 100644 --- a/lib/spack/spack/test/modules.py +++ b/lib/spack/spack/test/modules.py @@ -357,6 +357,21 @@ class TestTcl(object): generator = tcl_factory(spec) assert 'bar' in generator.use_name + def test_setup_environment(self, tcl_factory): + spec = spack.spec.Spec('mpileaks') + spec.concretize() + content = get_modulefile_content(tcl_factory, spec) + assert len([x for x in content if 'setenv FOOBAR' in x]) == 1 + assert len( + [x for x in content if 'setenv FOOBAR "mpileaks"' in x] + ) == 1 + + content = get_modulefile_content(tcl_factory, spec['callpath']) + assert len([x for x in content if 'setenv FOOBAR' in x]) == 1 + assert len( + [x for x in content if 'setenv FOOBAR "callpath"' in x] + ) == 1 + @pytest.mark.usefixtures('config', 'builtin_mock', 'stringio_open') class TestLmod(object): |