zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix: spec lists can now include multiple references

Browse Source
This commit is contained in:
Gregory Becker
2019-05-08 12:23:17 -07:00
committed by Todd Gamblin
parent 9577ade3ce
commit 88295d927e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/spack/spack/spec_list.py
View File

@@ -131,8 +131,7 @@ def _expand_references(self, yaml):
if name in self._reference:
ret = [self._expand_references(i) for i in yaml[:idx]]
ret += self._reference[name].specs_as_yaml_list
ret += [self._expand_references(i)
for i in yaml[idx + 1:]]
ret += self._expand_references(yaml[idx + 1:])
return ret
else:
msg = 'SpecList %s refers to ' % self.name

3
lib/spack/spack/test/spec_list.py
View File

@@ -8,10 +8,11 @@
class TestSpecList(object):
default_input = ['mpileaks', '$mpis',
{'matrix': [['hypre'], ['$gccs', '%clang@3.3']]},
{'matrix': [['hypre'], ['$gccs', '$clangs']]},
'libelf']
default_reference = {'gccs': SpecList('gccs', ['%gcc@4.5.0']),
'clangs': SpecList('clangs', ['%clang@3.3']),
'mpis': SpecList('mpis', ['zmpi@1.0', 'mpich@3.0'])}
default_expansion = ['mpileaks', 'zmpi@1.0', 'mpich@3.0',