Merge pull request #1354 from paulhopkins/bugfix/preferred_variants_do_not_recognise_-variant

Bugfix/preferred variants do not recognise  -variant

lib/spack/spack/preferred_packages.py

@@ -162,8 +162,8 @@ def spec_preferred_variants(self, pkgname):
         """Return a VariantMap of preferred variants and their values"""
         variants = self.preferred.get(pkgname, {}).get('variants', '')
         if not isinstance(variants, basestring):
-            variants = "".join(variants)
-        return spack.spec.Spec(pkgname + variants).variants
+            variants = " ".join(variants)
+        return spack.spec.Spec("%s %s" % (pkgname, variants)).variants
 
     def version_compare(self, pkgname, a, b):
         """Return less-than-0, 0, or greater than 0 if version a of pkgname is

lib/spack/spack/test/__init__.py

@@ -39,9 +39,9 @@
     'pattern', 'python_version', 'git_fetch', 'svn_fetch', 'hg_fetch',
     'mirror', 'modules', 'url_extrapolate', 'cc', 'link_tree', 'spec_yaml',
     'optional_deps', 'make_executable', 'build_system_guess', 'lock',
-    'database', 'namespace_trie', 'yaml', 'sbang', 'environment', 'cmd.find',
-    'cmd.uninstall', 'cmd.test_install', 'cmd.test_compiler_cmd',
-    'cmd.module'
+    'database', 'namespace_trie', 'yaml', 'sbang', 'environment',
+    'concretize_preferences', 'cmd.find', 'cmd.uninstall', 'cmd.test_install',
+    'cmd.test_compiler_cmd', 'cmd.module'
 ]
 
 

lib/spack/spack/test/concretize_preferences.py

@@ -0,0 +1,106 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+import spack
+import spack.architecture
+from spack.test.mock_packages_test import *
+from tempfile import mkdtemp
+
+
+class ConcretizePreferencesTest(MockPackagesTest):
+    """Test concretization preferences are being applied correctly.
+    """
+
+    def setUp(self):
+        """Create config section to store concretization preferences
+        """
+        super(ConcretizePreferencesTest, self).setUp()
+        self.tmp_dir = mkdtemp('.tmp', 'spack-config-test-')
+        spack.config.ConfigScope('concretize',
+                                 os.path.join(self.tmp_dir, 'concretize'))
+
+    def tearDown(self):
+        super(ConcretizePreferencesTest, self).tearDown()
+        shutil.rmtree(self.tmp_dir, True)
+        spack.pkgsort = spack.PreferredPackages()
+
+    def concretize(self, abstract_spec):
+        return Spec(abstract_spec).concretized()
+
+    def update_packages(self, pkgname, section, value):
+        """Update config and reread package list"""
+        conf = {pkgname: {section: value}}
+        spack.config.update_config('packages', conf, 'concretize')
+        spack.pkgsort = spack.PreferredPackages()
+
+    def assert_variant_values(self, spec, **variants):
+        concrete = self.concretize(spec)
+        for variant, value in variants.items():
+            self.assertEqual(concrete.variants[variant].value, value)
+
+    def test_preferred_variants(self):
+        """Test preferred variants are applied correctly
+        """
+        self.update_packages('mpileaks', 'variants',
+                             '~debug~opt+shared+static')
+        self.assert_variant_values('mpileaks', debug=False, opt=False,
+                                   shared=True, static=True)
+
+        self.update_packages('mpileaks', 'variants',
+                             ['+debug', '+opt', '~shared', '-static'])
+        self.assert_variant_values('mpileaks', debug=True, opt=True,
+                                   shared=False, static=False)
+
+    def test_preferred_compilers(self):
+        """Test preferred compilers are applied correctly
+        """
+        self.update_packages('mpileaks', 'compiler', ['clang@3.3'])
+        spec = self.concretize('mpileaks')
+        self.assertEqual(spec.compiler, spack.spec.CompilerSpec('clang@3.3'))
+
+        self.update_packages('mpileaks', 'compiler', ['gcc@4.5.0'])
+        spec = self.concretize('mpileaks')
+        self.assertEqual(spec.compiler, spack.spec.CompilerSpec('gcc@4.5.0'))
+
+    def test_preferred_versions(self):
+        """Test preferred package versions are applied correctly
+        """
+        self.update_packages('mpileaks', 'version', ['2.3'])
+        spec = self.concretize('mpileaks')
+        self.assertEqual(spec.version, spack.spec.Version('2.3'))
+
+        self.update_packages('mpileaks', 'version', ['2.2'])
+        spec = self.concretize('mpileaks')
+        self.assertEqual(spec.version, spack.spec.Version('2.2'))
+
+    def test_preferred_providers(self):
+        """Test preferred providers of virtual packages are applied correctly
+        """
+        self.update_packages('all', 'providers', {'mpi': ['mpich']})
+        spec = self.concretize('mpileaks')
+        self.assertTrue('mpich' in spec)
+
+        self.update_packages('all', 'providers', {'mpi': ['zmpi']})
+        spec = self.concretize('mpileaks')
+        self.assertTrue('zmpi', spec)

var/spack/repos/builtin.mock/packages/mpileaks/package.py

@@ -24,6 +24,7 @@
 ##############################################################################
 from spack import *
 
+
 class Mpileaks(Package):
     homepage = "http://www.llnl.gov"
     url      = "http://www.llnl.gov/mpileaks-1.0.tar.gz"
@@ -35,6 +36,8 @@ class Mpileaks(Package):
 
     variant('debug', default=False, description='Debug variant')
     variant('opt',   default=False, description='Optimized variant')
+    variant('shared', default=True, description='Build shared library')
+    variant('static', default=True, description='Build static library')
 
     depends_on("mpi")
     depends_on("callpath")