From 802c5bdff7b32e425514f25a7ab55c2df5aa5b83 Mon Sep 17 00:00:00 2001
From: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com>
Date: Thu, 10 Dec 2020 10:35:27 -0800
Subject: Tests: enable re-use of post-install tests in smoke tests (#20298)
---
lib/spack/spack/build_environment.py | 6 +++++-
var/spack/repos/builtin/packages/hdf5/package.py | 5 +++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py
index cb1ba21ba5..a2eabbc3db 100644
--- a/lib/spack/spack/build_environment.py
+++ b/lib/spack/spack/build_environment.py
@@ -750,6 +750,9 @@ def setup_package(pkg, dirty, context='build'):
elif context == 'test':
import spack.user_environment as uenv # avoid circular import
env.extend(uenv.environment_modifications_for_spec(pkg.spec))
+ env.extend(
+ modifications_from_dependencies(pkg.spec, context=context)
+ )
set_module_variables_for_package(pkg)
env.prepend_path('PATH', '.')
@@ -814,7 +817,8 @@ def modifications_from_dependencies(spec, context):
}
deptype, method = deptype_and_method[context]
- for dspec in spec.traverse(order='post', root=False, deptype=deptype):
+ root = context == 'test'
+ for dspec in spec.traverse(order='post', root=root, deptype=deptype):
dpkg = dspec.package
set_module_variables_for_package(dpkg)
# Allow dependencies to modify the module
diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py
index b37c7ede65..97ce271f79 100644
--- a/var/spack/repos/builtin/packages/hdf5/package.py
+++ b/var/spack/repos/builtin/packages/hdf5/package.py
@@ -20,6 +20,8 @@ class Hdf5(AutotoolsPackage):
git = "https://bitbucket.hdfgroup.org/scm/hdffv/hdf5.git"
maintainers = ['lrknox']
+ test_requires_compiler = True
+
version('develop', branch='develop')
version('1.12.0', sha256='a62dcb276658cb78e6795dd29bf926ed7a9bc4edf6e77025cd2c689a8f97c17a')
@@ -426,5 +428,4 @@ HDF5 version {version} {version}
self._test_example()
# Run existing install check
- # TODO: Restore once address built vs. installed state
- # self._check_install()
+ self._check_install()
--
cgit v1.2.3-70-g09d2