build_systems: factored build-time test running into base class

alalazo · alalazo · commit 6b64146e233e · 2017-01-21T18:01:07.000+01:00
diff --git a/lib/spack/spack/build_systems/autotools.py b/lib/spack/spack/build_systems/autotools.py
@@ -30,9 +30,8 @@
 from subprocess import PIPE
 from subprocess import check_call
 
-import llnl.util.tty as tty
 from llnl.util.filesystem import working_dir
-from spack.package import PackageBase, run_after, on_package_attributes
+from spack.package import PackageBase, run_after
 
 
 class AutotoolsPackage(PackageBase):
@@ -60,6 +59,8 @@ class AutotoolsPackage(PackageBase):
     build_targets = []
     install_targets = ['install']
 
+    build_time_test_callbacks = ['check']
+
     def do_patch_config_guess(self):
         """Some packages ship with an older config.guess and need to have
         this updated when installed on a newer architecture."""
@@ -176,20 +177,7 @@ def install(self, spec, prefix):
         with working_dir(self.build_directory()):
             inspect.getmodule(self).make(*self.install_targets)
 
-    @run_after('build')
-    @on_package_attributes(run_tests=True)
-    def _run_default_function(self):
-        """This function is run after build if ``self.run_tests == True``
-
-        It will search for a method named ``check`` and run it. A sensible
-        default is provided in the base class.
-        """
-        try:
-            fn = getattr(self, 'check')
-            tty.msg('Trying default sanity checks [check]')
-            fn()
-        except AttributeError:
-            tty.msg('Skipping default sanity checks [method `check` not implemented]')  # NOQA: ignore=E501
+    run_after('build')(PackageBase._run_default_build_time_test_callbacks)
 
     def check(self):
         """Default test: search the Makefile for targets ``test`` and ``check``
diff --git a/lib/spack/spack/build_systems/cmake.py b/lib/spack/spack/build_systems/cmake.py
@@ -26,11 +26,10 @@
 import inspect
 import platform
 
-import llnl.util.tty as tty
 import spack.build_environment
 from llnl.util.filesystem import working_dir, join_path
 from spack.directives import depends_on
-from spack.package import PackageBase, run_after, on_package_attributes
+from spack.package import PackageBase, run_after
 
 
 class CMakePackage(PackageBase):
@@ -56,6 +55,8 @@ class CMakePackage(PackageBase):
     build_targets = []
     install_targets = ['install']
 
+    build_time_test_callbacks = ['check']
+
     depends_on('cmake', type='build')
 
     def build_type(self):
@@ -126,20 +127,7 @@ def install(self, spec, prefix):
         with working_dir(self.build_directory()):
             inspect.getmodule(self).make(*self.install_targets)
 
-    @run_after('build')
-    @on_package_attributes(run_tests=True)
-    def _run_default_function(self):
-        """This function is run after build if ``self.run_tests == True``
-
-        It will search for a method named ``check`` and run it. A sensible
-        default is provided in the base class.
-        """
-        try:
-            fn = getattr(self, 'check')
-            tty.msg('Trying default build sanity checks [check]')
-            fn()
-        except AttributeError:
-            tty.msg('Skipping default build sanity checks [method `check` not implemented]')  # NOQA: ignore=E501
+    run_after('build')(PackageBase._run_default_build_time_test_callbacks)
 
     def check(self):
         """Default test: search the Makefile for the target ``test``
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
@@ -1709,6 +1709,27 @@ def rpath_args(self):
         """
         return " ".join("-Wl,-rpath,%s" % p for p in self.rpath)
 
+    build_time_test_callbacks = None
+
+    @on_package_attributes(run_tests=True)
+    def _run_default_build_time_test_callbacks(self):
+        """Tries to call all the methods that are listed in the attribute
+        ``build_time_test_callbacks`` if ``self.run_tests is True``.
+
+        If ``build_time_test_callbacks is None`` returns immediately.
+        """
+        if self.build_time_test_callbacks is None:
+            return
+
+        for name in self.build_time_test_callbacks:
+            try:
+                fn = getattr(self, name)
+                tty.msg('RUN-TESTS: build-time tests [{0}]'.format(name))
+                fn()
+            except AttributeError:
+                msg = 'RUN-TESTS: method not implemented [{0}]'
+                tty.warn(msg.format(name))
+
 
 class Package(PackageBase):
     phases = ['install']
