From 7eca383b10f017666c320ffd7deb6cae83b5c26b Mon Sep 17 00:00:00 2001
From: Todd Gamblin <tgamblin@llnl.gov>
Date: Thu, 10 Mar 2016 01:12:25 -0800
Subject: [PATCH 1/2] Add sanity check paths to packages; fix #505

---
 lib/spack/spack/package.py | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index 696adaf8965..02fb3e58348 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -318,6 +318,17 @@ class SomePackage(Package):
     """Most packages are NOT extendable.  Set to True if you want extensions."""
     extendable = False
 
+    """List of prefix-relative file paths. If these do not exist after
+       install, or if they exist but are not files, sanity checks fail.
+    """
+    sanity_check_files = []
+
+    """List of prefix-relative directory paths. If these do not exist
+       after install, or if they exist but are not directories, sanity
+       checks will fail.
+    """
+    sanity_check_dirs = []
+
 
     def __init__(self, spec):
         # this determines how the package should be built.
@@ -909,7 +920,7 @@ def build_process():
                          raise e
 
                      # Ensure that something was actually installed.
-                     self._sanity_check_install()
+                     self.sanity_check_prefix()
 
                      # Copy provenance into the install directory on success
                      log_install_path = spack.install_layout.build_log_path(self.spec)
@@ -952,7 +963,18 @@ def build_process():
         spack.hooks.post_install(self)
 
 
-    def _sanity_check_install(self):
+    def sanity_check_prefix(self):
+        """This function checks whether install succeeded."""
+        def check_paths(path_list, filetype, predicate):
+            for path in path_list:
+                abs_path = os.path.join(self.prefix, path)
+                if not predicate(abs_path):
+                    raise InstallError("Install failed for %s. No such %s in prefix: %s"
+                                       % (self.name, filetype, path))
+
+        check_paths(self.sanity_check_files, 'file', os.path.isfile)
+        check_paths(self.sanity_check_dirs, 'directory', os.path.isdir)
+
         installed = set(os.listdir(self.prefix))
         installed.difference_update(spack.install_layout.hidden_file_paths)
         if not installed:

From 68d22253eca40bc4223234d6c26204f292be6a0c Mon Sep 17 00:00:00 2001
From: Todd Gamblin <tgamblin@llnl.gov>
Date: Tue, 15 Mar 2016 17:22:48 -0700
Subject: [PATCH 2/2] Add sanity checks to the libelf build.

---
 var/spack/repos/builtin/packages/libelf/package.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/var/spack/repos/builtin/packages/libelf/package.py b/var/spack/repos/builtin/packages/libelf/package.py
index 29bc21b65c4..0fcb56c164d 100644
--- a/var/spack/repos/builtin/packages/libelf/package.py
+++ b/var/spack/repos/builtin/packages/libelf/package.py
@@ -38,6 +38,9 @@ class Libelf(Package):
 
     provides('elf')
 
+    sanity_check_files = ['include/libelf.h']
+    sanity_check_dirs  = ['lib']
+
     def install(self, spec, prefix):
         configure("--prefix=" + prefix,
                   "--enable-shared",