Ensure conditional possible values play well with conditional variants

alalazo · alalazo · commit b25ca927155f · 2022-03-16T15:45:07.000+01:00
diff --git a/lib/spack/spack/test/concretize.py b/lib/spack/spack/test/concretize.py
@@ -1409,9 +1409,22 @@ def test_do_not_invent_new_concrete_versions_unless_necessary(self):
     def test_conditional_values_in_variants(self, spec_str):
         if spack.config.get('config:concretizer') == 'original':
             pytest.skip(
-                "Original concretizer doesn't resolve concrete versions to known ones"
+                "Original concretizer doesn't resolve conditional values in variants"
             )
 
         s = Spec(spec_str)
         with pytest.raises((RuntimeError, spack.error.UnsatisfiableSpecError)):
             s.concretize()
+
+    def test_conditional_values_in_conditional_variant(self):
+        """Test that conditional variants play well with conditional possible values"""
+        if spack.config.get('config:concretizer') == 'original':
+            pytest.skip(
+                "Original concretizer doesn't resolve conditional values in variants"
+            )
+
+        s = Spec('conditional-values-in-variant@1.50.0').concretized()
+        assert 'cxxstd' not in s.variants
+
+        s = Spec('conditional-values-in-variant@1.60.0').concretized()
+        assert 'cxxstd' in s.variants
diff --git a/var/spack/repos/builtin.mock/packages/conditional-values-in-variant/package.py b/var/spack/repos/builtin.mock/packages/conditional-values-in-variant/package.py
@@ -3,14 +3,14 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 class ConditionalValuesInVariant(Package):
-    """Mimic the real netlib-lapack, that may be built on top of an
-    optimized blas.
-    """
+    """Package with conditional possible values in a variant"""
     homepage = "https://dev.null"
 
     version('1.73.0')
     version('1.72.0')
     version('1.62.0')
+    version('1.60.0')
+    version('1.50.0')
 
     variant(
         'cxxstd', default='98',
@@ -22,5 +22,6 @@ class ConditionalValuesInVariant(Package):
             Value('2a', when='@1.73.0:')
         ),
         multi=False,
-        description='Use the specified C++ standard when building.'
+        description='Use the specified C++ standard when building.',
+        when='@1.60.0:'
     )
