diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/solver/asp.py | 4 | ||||
| -rw-r--r-- | lib/spack/spack/test/cmd/dependents.py | 6 | ||||
| -rw-r--r-- | lib/spack/spack/test/concretize.py | 8 |
3 files changed, 14 insertions, 4 deletions
diff --git a/lib/spack/spack/solver/asp.py b/lib/spack/spack/solver/asp.py index b15c4826be..56f4ba75a4 100644 --- a/lib/spack/spack/solver/asp.py +++ b/lib/spack/spack/solver/asp.py @@ -1826,8 +1826,8 @@ class SpecBuilder(object): # fix flags after all specs are constructed self.reorder_flags() - for s in self._specs.values(): - spack.spec.Spec.inject_patches_variant(s) + for root in set([spec.root for spec in self._specs.values()]): + spack.spec.Spec.inject_patches_variant(root) # Add external paths to specs with just external modules for s in self._specs.values(): diff --git a/lib/spack/spack/test/cmd/dependents.py b/lib/spack/spack/test/cmd/dependents.py index 681b255d05..bd87f92a65 100644 --- a/lib/spack/spack/test/cmd/dependents.py +++ b/lib/spack/spack/test/cmd/dependents.py @@ -23,7 +23,8 @@ def test_immediate_dependents(mock_packages): 'libdwarf', 'patch-a-dependency', 'patch-several-dependencies', - 'quantum-espresso' + 'quantum-espresso', + 'conditionally-patch-dependency' ]) @@ -38,7 +39,8 @@ def test_transitive_dependents(mock_packages): 'multivalue-variant', 'singlevalue-variant-dependent', 'patch-a-dependency', 'patch-several-dependencies', - 'quantum-espresso' + 'quantum-espresso', + 'conditionally-patch-dependency' ]) diff --git a/lib/spack/spack/test/concretize.py b/lib/spack/spack/test/concretize.py index 8366ecca14..fed0432f91 100644 --- a/lib/spack/spack/test/concretize.py +++ b/lib/spack/spack/test/concretize.py @@ -967,3 +967,11 @@ class TestConcretize(object): s = Spec('a %gcc@foo os=redhat6').concretized() assert '%gcc@foo' in s + + def test_all_patches_applied(self): + uuidpatch = 'a60a42b73e03f207433c5579de207c6ed61d58e4d12dd3b5142eb525728d89ea' + localpatch = 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' + spec = spack.spec.Spec('conditionally-patch-dependency+jasper') + spec.concretize() + assert ((uuidpatch, localpatch) == + spec['libelf'].variants['patches'].value) |