ArchSpec: fix constraint satisfaction for targets

alalazo · tgamblin · commit 77444dff1065 · 2019-10-10T16:22:38.000-07:00
fixes #13111 Due to a missing case we were treating a single target that was not equal to the one we were comparing to as a range open on the right.
diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py
@@ -395,6 +395,10 @@ def _satisfies_target(self, other_target, strict):
             if not sep and self_target == t_min:
                 return True
 
+            if not sep and self_target != t_min:
+                return False
+
+            # Check against a range
             min_ok = self_target.microarchitecture >= t_min if t_min else True
             max_ok = self_target.microarchitecture <= t_max if t_max else True
 
diff --git a/lib/spack/spack/test/spec_semantics.py b/lib/spack/spack/test/spec_semantics.py
@@ -972,7 +972,12 @@ def test_forwarding_of_architecture_attributes(self):
         ('libelf target=haswell', 'target=:haswell', True),
         ('libelf target=haswell', 'target=icelake,:nocona', False),
         ('libelf target=haswell', 'target=haswell,:nocona', True),
+        # Check that a single target is not treated as the start
+        # or the end of an open range
+        ('libelf target=haswell', 'target=x86_64', False),
+        ('libelf target=x86_64', 'target=haswell', False),
     ])
+    @pytest.mark.regression('13111')
     def test_target_constraints(self, spec, constraint, expected_result):
         s = Spec(spec)
         assert s.satisfies(constraint) is expected_result
