hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Uniquify suffixes added to module names (#14920)

Browse source
This commit is contained in:
Seth R. Johnson 2020-02-26 12:03:28 -05:00 committed by Todd Gamblin
parent b02981f10c
commit f3a1a8c6fe
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/spack/spack/modules/common.py
View file

@ -428,6 +428,7 @@ def suffixes(self):
for constraint, suffix in self.conf.get('suffixes', {}).items(): for constraint, suffix in self.conf.get('suffixes', {}).items():
if constraint in self.spec: if constraint in self.spec:
suffixes.append(suffix) suffixes.append(suffix)
suffixes = sorted(set(suffixes))
if self.hash: if self.hash:
suffixes.append(self.hash) suffixes.append(self.hash)
return suffixes return suffixes

1
lib/spack/spack/test/data/modules/tcl/suffix.yaml
View file

@ -5,3 +5,4 @@ tcl:
suffixes: suffixes:
'+debug': foo '+debug': foo
'~debug': bar '~debug': bar
'^mpich': foo

3
lib/spack/spack/test/modules/tcl.py
View file

@ -215,9 +215,10 @@ def test_suffixes(self, module_configuration, factory):
writer, spec = factory('mpileaks+debug arch=x86-linux') writer, spec = factory('mpileaks+debug arch=x86-linux')
assert 'foo' in writer.layout.use_name assert 'foo' in writer.layout.use_name
assert 'foo-foo' not in writer.layout.use_name
writer, spec = factory('mpileaks~debug arch=x86-linux') writer, spec = factory('mpileaks~debug arch=x86-linux')
assert 'bar' in writer.layout.use_name assert 'bar-foo' in writer.layout.use_name
def test_setup_environment(self, modulefile_content, module_configuration): def test_setup_environment(self, modulefile_content, module_configuration):
"""Tests the internal set-up of run-time environment.""" """Tests the internal set-up of run-time environment."""