Fix failing tests due to missing defaults for ols, serialized specs

lib/spack/spack/build_systems/autotools.py

@@ -61,6 +61,9 @@ class AutotoolsPackage(spack.package.PackageBase):
     #: system base class
     build_system_class = 'AutotoolsPackage'
 
+    #: Legacy buildsystem attribute used to deserialize and install old specs
+    legacy_buildsystem = 'autotools'
+
     buildsystem('autotools')
     with when('buildsystem=autotools'):
         depends_on('gnuconfig', type='build', when='target=ppc64le:')

lib/spack/spack/build_systems/bundle.py

@@ -13,6 +13,9 @@ class BundlePackage(spack.package.PackageBase):
     #: build-system class we are using
     build_system_class = 'BundlePackage'
 
+    #: Legacy buildsystem attribute used to deserialize and install old specs
+    legacy_buildsystem = 'bundle'
+
     spack.directives.buildsystem('bundle')
     #: Bundle packages do not have associated source or binary code.
     has_code = False

lib/spack/spack/build_systems/cmake.py

@@ -81,6 +81,9 @@ class CMakePackage(PackageBase):
     #: system base class
     build_system_class = 'CMakePackage'
 
+    #: Legacy buildsystem attribute used to deserialize and install old specs
+    legacy_buildsystem = 'cmakelists'
+
     buildsystem('cmakelists')
     with when('buildsystem=cmakelists'):
         # https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html

lib/spack/spack/build_systems/generic.py

@@ -33,5 +33,7 @@ class Package(spack.package.PackageBase):
     #: This attribute is used in UI queries that require to know which
     #: build-system class we are using
     build_system_class = 'Package'
+    #: Legacy buildsystem attribute used to deserialize and install old specs
+    legacy_buildsystem = 'generic'
     #: Build system used by this package (will become a variant)
     spack.directives.buildsystem('generic')

lib/spack/spack/build_systems/makefile.py

@@ -48,6 +48,8 @@ class MakefilePackage(spack.package.PackageBase):
     #: This attribute is used in UI queries that need to know the build
     #: system base class
     build_system_class = 'MakefilePackage'
+    #: Legacy buildsystem attribute used to deserialize and install old specs
+    legacy_buildsystem = 'makefile'
 
     buildsystem('makefile')
     conflicts('platform=windows')

lib/spack/spack/build_systems/maven.py

@@ -27,6 +27,9 @@ class MavenPackage(spack.package.PackageBase):
     # build-system class we are using
     build_system_class = 'MavenPackage'
 
+    #: Legacy buildsystem attribute used to deserialize and install old specs
+    legacy_buildsystem = 'maven'
+
     buildsystem('maven')
     with when('buildsystem=maven'):
         depends_on('java', type=('build', 'run'))

lib/spack/spack/build_systems/meson.py

@@ -48,6 +48,9 @@ class MesonPackage(spack.package.PackageBase):
     #: system base class
     build_system_class = 'MesonPackage'
 
+    #: Legacy buildsystem attribute used to deserialize and install old specs
+    legacy_buildsystem = 'mesonbuild'
+
     buildsystem('mesonbuild')
     with when('buildsystem=mesonbuild'):
         variant('buildtype', default='debugoptimized',

lib/spack/spack/build_systems/octave.py

@@ -25,6 +25,8 @@ class OctavePackage(PackageBase):
     # To be used in UI queries that require to know which
     # build-system class we are using
     build_system_class = 'OctavePackage'
+    #: Legacy buildsystem attribute used to deserialize and install old specs
+    legacy_buildsystem = 'octave'
 
     buildsystem('octave')
     with when('buildsystem=octave'):

lib/spack/spack/build_systems/perl.py

@@ -38,6 +38,8 @@ class PerlPackage(PackageBase):
     #: This attribute is used in UI queries that need to know the build
     #: system base class
     build_system_class = 'PerlPackage'
+    #: Legacy buildsystem attribute used to deserialize and install old specs
+    legacy_buildsystem = 'perlbuild'
 
     buildsystem('perlbuild')
 

lib/spack/spack/build_systems/python.py

@@ -36,6 +36,8 @@ class PythonPackage(spack.package.PackageBase):
     # To be used in UI queries that require to know which
     # build-system class we are using
     build_system_class = 'PythonPackage'
+    #: Legacy buildsystem attribute used to deserialize and install old specs
+    legacy_buildsystem = 'python_pip'
 
     buildsystem('python_pip')
     with when('buildsystem=python_pip'):

lib/spack/spack/build_systems/qmake.py

@@ -31,6 +31,8 @@ class QMakePackage(spack.package.PackageBase):
     #: This attribute is used in UI queries that need to know the build
     #: system base class
     build_system_class = 'QMakePackage'
+    #: Legacy buildsystem attribute used to deserialize and install old specs
+    legacy_buildsystem = 'qmake'
 
     buildsystem('qmake')
     depends_on('qt', type='build', when='buildsystem=qmake')

lib/spack/spack/build_systems/ruby.py

@@ -26,6 +26,8 @@ class RubyPackage(spack.package.PackageBase):
     #: This attribute is used in UI queries that need to know the build
     #: system base class
     build_system_class = 'RubyPackage'
+    #: Legacy buildsystem attribute used to deserialize and install old specs
+    legacy_buildsystem = 'ruby'
 
     buildsystem('ruby')
     extends('ruby', when='buildsystem=ruby')

lib/spack/spack/build_systems/scons.py

@@ -32,6 +32,8 @@ class SConsPackage(spack.package.PackageBase):
 
     #: Callback names for build-time test
     build_time_test_callbacks = ['build_test']
+    #: Legacy buildsystem attribute used to deserialize and install old specs
+    legacy_buildsystem = 'scons'
 
     buildsystem('scons')
     depends_on('scons', type='build', when='buildsystem=scons')

lib/spack/spack/build_systems/sip.py

@@ -40,6 +40,8 @@ class SIPPackage(spack.package.PackageBase):
 
     #: Callback names for install-time test
     install_time_test_callbacks = ['test']
+    #: Legacy buildsystem attribute used to deserialize and install old specs
+    legacy_buildsystem = 'sip'
 
     buildsystem('sip')
     with when('buildsystem=sip'):

lib/spack/spack/build_systems/waf.py

@@ -42,6 +42,8 @@ class WafPackage(spack.package.PackageBase):
     # To be used in UI queries that require to know which
     # build-system class we are using
     build_system_class = 'WafPackage'
+    #: Legacy buildsystem attribute used to deserialize and install old specs
+    legacy_buildsystem = 'waf'
 
     buildsystem('waf')
     # Much like AutotoolsPackage does not require automake and autoconf

lib/spack/spack/package.py

@@ -2588,7 +2588,12 @@ def rpath_args(self):
 
     @property
     def builder(self):
-        key = self.spec.variants['buildsystem'].value
+        try:
+            key = self.spec.variants['buildsystem'].value
+        except KeyError:
+            # We are reading an old spec without the buildsystem variant
+            key = self.legacy_buildsystem
+
         return spack.builder.BUILDER_CLS[key](self)
 
     def _run_test_callbacks(self, method_names, callback_type='install'):

lib/spack/spack/test/build_distribution.py

@@ -31,8 +31,9 @@ def test_build_tarball_overwrite(
         install_mockery, mock_fetch, monkeypatch, tmpdir):
 
     with tmpdir.as_cwd():
-        spec = spack.spec.Spec('trivial-install-test-package').concretized()
+        spec = spack.spec.Spec('trivial-install-test-package')
         install(str(spec))
+        spec.concretize()
 
         # Runs fine the first time, throws the second time
         spack.binary_distribution._build_tarball(spec, '.', unsigned=True)

lib/spack/spack/test/cmd/info.py

@@ -53,7 +53,7 @@ def test_it_just_runs(pkg):
 
 
 def test_info_noversion(mock_packages, info_lines, mock_print):
-    """Check that a mock package with no versions or variants outputs None."""
+    """Check that a mock package with no versions outputs None."""
     info('noversion')
 
     line_iter = info_lines.__iter__()
@@ -62,7 +62,7 @@ def test_info_noversion(mock_packages, info_lines, mock_print):
             has = [desc in line for desc in ['Preferred', 'Safe', 'Deprecated']]
             if not any(has):
                 continue
-        elif 'Variants' not in line:
+        else:
             continue
 
         assert 'None' in next(line_iter).strip()

lib/spack/spack/test/concretize.py

@@ -236,7 +236,7 @@ def test_concretize(self, spec):
         check_concretize(spec)
 
     def test_concretize_mention_build_dep(self):
-        spec = check_concretize('cmake-client ^cmake@3.4.3')
+        spec = check_concretize('cmake-client ^cmake@3.21.3')
 
         # Check parent's perspective of child
         to_dependencies = spec.edges_to_dependencies(name='cmake')

lib/spack/spack/test/graph.py

@@ -107,7 +107,18 @@ def test_ascii_graph_mpileaks(config, mock_packages, monkeypatch):
 o | libdwarf
 |/
 o libelf
-'''
+''' or graph_str == r"""o mpileaks
+|\
+o | callpath
+|\|
+| o mpich
+|
+o dyninst
+|\
+o | libdwarf
+|/
+o libelf
+"""
 
 
 def test_topological_sort_filtering_dependency_types(config, mock_packages):

var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py

@@ -9,7 +9,7 @@ class TrivialInstallTestPackage(Package):
     """This package is a stub with a trivial install method.  It allows us
        to test the install and uninstall logic of spack."""
     homepage = "http://www.example.com/trivial_install"
-    url      = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz"
+    url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz"
 
     version('1.0', '0123456789abcdef0123456789abcdef')