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

Add unit tests for dependencies being patched by parent

Browse Source
This commit is contained in:
Massimiliano Culpo 2020-10-28 19:15:33 +01:00 committed by Todd Gamblin
parent e226523aeb
commit 930b05fab4
4 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/spack/spack/test/concretize.py
View File

@ -693,3 +693,20 @@ def test_conditional_dependencies(self, spec_str, expected, unexpected):
for dep in unexpected: for dep in unexpected:
msg = '"{0}" is in "{1}" but was unexpected' msg = '"{0}" is in "{1}" but was unexpected'
assert dep not in s, msg.format(dep, spec_str) assert dep not in s, msg.format(dep, spec_str)
@pytest.mark.parametrize('spec_str,patched_deps', [
('patch-several-dependencies', [('libelf', 1), ('fake', 2)]),
('patch-several-dependencies@1.0',
[('libelf', 1), ('fake', 2), ('libdwarf', 1)]),
('patch-several-dependencies@1.0 ^libdwarf@20111030',
[('libelf', 1), ('fake', 2), ('libdwarf', 2)]),
('patch-several-dependencies ^libelf@0.8.10',
[('libelf', 2), ('fake', 2)]),
('patch-several-dependencies +foo', [('libelf', 2), ('fake', 2)])
])
def test_patching_dependencies(self, spec_str, patched_deps):
s = Spec(spec_str).concretized()
for dep, num_patches in patched_deps:
assert s[dep].satisfies('patches=*')
assert len(s[dep].variants['patches'].value) == num_patches

0
var/spack/repos/builtin.mock/packages/libelf/local.patch Normal file
View File

2
var/spack/repos/builtin.mock/packages/libelf/package.py
View File

@ -14,5 +14,7 @@ class Libelf(Package):
version('0.8.12', 'e21f8273d9f5f6d43a59878dc274fec7') version('0.8.12', 'e21f8273d9f5f6d43a59878dc274fec7')
version('0.8.10', '9db4d36c283d9790d8fa7df1f4d7b4d9') version('0.8.10', '9db4d36c283d9790d8fa7df1f4d7b4d9')
patch('local.patch', when='@0.8.10')
def install(self, spec, prefix): def install(self, spec, prefix):
touch(prefix.libelf) touch(prefix.libelf)

4
var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py
View File

@ -15,10 +15,14 @@ class PatchSeveralDependencies(Package):
version('2.0', '0123456789abcdef0123456789abcdef') version('2.0', '0123456789abcdef0123456789abcdef')
version('1.0', '0123456789abcdef0123456789abcdef') version('1.0', '0123456789abcdef0123456789abcdef')
variant('foo', default=False,
description='Forces a version on libelf')
# demonstrate all the different ways to patch things # demonstrate all the different ways to patch things
# single patch file in repo # single patch file in repo
depends_on('libelf', patches='foo.patch') depends_on('libelf', patches='foo.patch')
depends_on('libelf@0.8.10', patches='foo.patch', when='+foo')
# using a list of patches in one depends_on # using a list of patches in one depends_on
depends_on('libdwarf', patches=[ depends_on('libdwarf', patches=[