diff options
| author | scheibelp <scheibel1@llnl.gov> | 2017-08-07 10:48:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-07 10:48:48 -0700 |
| commit | 5a94cee216d071b6232772b7db8adfdda89f8feb (patch) | |
| tree | c48538d857145b6497c355a18159558a7a760299 /lib | |
| parent | 392603e90b6c34a0d53ec9276188134e50e59e6b (diff) | |
| download | spack-5a94cee216d071b6232772b7db8adfdda89f8feb.tar.gz spack-5a94cee216d071b6232772b7db8adfdda89f8feb.tar.bz2 spack-5a94cee216d071b6232772b7db8adfdda89f8feb.tar.xz spack-5a94cee216d071b6232772b7db8adfdda89f8feb.zip | |
Variant satisfaction for indirect dependencies
Fixes #4898
Constraints that were supposed to be conditionally activated for
specified values of a single-valued variant were being activated
unconditionally in the case that the variant was associated with
an implicit dependency. For example if X->Y->Z and Y places a
conditional constraint on Z for a given single-valued variant on
Y, then it would have been applied unconditionally when
concretizing X.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/spec.py | 1 | ||||
| -rw-r--r-- | lib/spack/spack/test/cmd/dependents.py | 3 | ||||
| -rw-r--r-- | lib/spack/spack/test/spec_semantics.py | 14 |
3 files changed, 17 insertions, 1 deletions
diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index cbbd48d9fa..32e08d3896 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -1879,6 +1879,7 @@ class Spec(object): pkg = spack.repo.get(self.fullname) conditions = pkg.dependencies[name] + substitute_abstract_variants(self) # evaluate when specs to figure out constraints on the dependency. dep = None for when_spec, dep_spec in conditions.items(): diff --git a/lib/spack/spack/test/cmd/dependents.py b/lib/spack/spack/test/cmd/dependents.py index 69f57d88a3..546d6d48c9 100644 --- a/lib/spack/spack/test/cmd/dependents.py +++ b/lib/spack/spack/test/cmd/dependents.py @@ -42,7 +42,8 @@ def test_transitive_dependents(builtin_mock): out, err = dependents('--transitive', 'libelf') actual = set(re.split(r'\s+', out.strip())) assert actual == set( - ['callpath', 'dyninst', 'libdwarf', 'mpileaks', 'multivalue_variant']) + ['callpath', 'dyninst', 'libdwarf', 'mpileaks', 'multivalue_variant', + 'singlevalue-variant-dependent']) def test_immediate_installed_dependents(builtin_mock, database): diff --git a/lib/spack/spack/test/spec_semantics.py b/lib/spack/spack/test/spec_semantics.py index 1623133ef3..4ed7c635e9 100644 --- a/lib/spack/spack/test/spec_semantics.py +++ b/lib/spack/spack/test/spec_semantics.py @@ -307,6 +307,20 @@ class TestSpecSematics(object): # Check that conditional dependencies are treated correctly assert '^b' in a + def test_unsatisfied_single_valued_variant(self): + a = Spec('a foobar=baz') + a.concretize() + assert '^b' not in a + + mv = Spec('multivalue_variant') + mv.concretize() + assert 'a@1.0' not in mv + + def test_indirect_unsatisfied_single_valued_variant(self): + spec = Spec('singlevalue-variant-dependent') + spec.concretize() + assert 'a@1.0' not in spec + def test_unsatisfiable_multi_value_variant(self): # Semantics for a multi-valued variant is different |