summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2021-01-12 15:42:11 +0100
committerTodd Gamblin <tgamblin@llnl.gov>2021-01-12 22:23:39 -0800
commit0bd76ac9e6d561dc8160c318db31d24827af0615 (patch)
tree4aad5c09da6900fd67489530b64b8f12d7a46afc /lib
parented8fe68cf2162a8a871e639035093722bcd2cb84 (diff)
downloadspack-0bd76ac9e6d561dc8160c318db31d24827af0615.tar.gz
spack-0bd76ac9e6d561dc8160c318db31d24827af0615.tar.bz2
spack-0bd76ac9e6d561dc8160c318db31d24827af0615.tar.xz
spack-0bd76ac9e6d561dc8160c318db31d24827af0615.zip
concretizer: require at least a dependency type to say the dependency holds
fixes #20784 Similarly to the previous bug, here we were deducing conditions to be imposed on nodes that were not part of the DAG.
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/solver/concretize.lp3
-rw-r--r--lib/spack/spack/test/concretize.py8
2 files changed, 11 insertions, 0 deletions
diff --git a/lib/spack/spack/solver/concretize.lp b/lib/spack/spack/solver/concretize.lp
index 22387cfd11..d706663aaa 100644
--- a/lib/spack/spack/solver/concretize.lp
+++ b/lib/spack/spack/solver/concretize.lp
@@ -93,6 +93,9 @@ dependency_conditions_hold(ID, Parent, Dependency) :-
attr(Name, Arg1, Arg2) : required_dependency_condition(ID, Name, Arg1, Arg2);
attr(Name, Arg1, Arg2, Arg3) : required_dependency_condition(ID, Name, Arg1, Arg2, Arg3);
dependency_condition(ID, Parent, Dependency);
+ % There must be at least a dependency type declared,
+ % otherwise the dependency doesn't hold
+ dependency_type(ID, _);
node(Parent);
not external(Parent).
diff --git a/lib/spack/spack/test/concretize.py b/lib/spack/spack/test/concretize.py
index 7dde479d87..48d0653a0c 100644
--- a/lib/spack/spack/test/concretize.py
+++ b/lib/spack/spack/test/concretize.py
@@ -1090,3 +1090,11 @@ class TestConcretize(object):
).concretized()
assert root.dag_hash() == new_root.dag_hash()
+
+ @pytest.mark.regression('20784')
+ def test_concretization_of_test_dependencies(self):
+ # With clingo we emit dependency_conditions regardless of the type
+ # of the dependency. We need to ensure that there's at least one
+ # dependency type declared to infer that the dependency holds.
+ s = Spec('test-dep-with-imposed-conditions').concretized()
+ assert 'c' not in s