zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests: enable re-use of post-install tests in smoke tests (#20298)

Browse Source
This commit is contained in:
Tamara Dahlgren 2020-12-10 10:35:27 -08:00 committed by Tamara Dahlgren
parent ab3f1b10db
commit 802c5bdff7
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/spack/spack/build_environment.py
View File

@ -750,6 +750,9 @@ def setup_package(pkg, dirty, context='build'):
elif context == 'test': elif context == 'test':
import spack.user_environment as uenv # avoid circular import import spack.user_environment as uenv # avoid circular import
env.extend(uenv.environment_modifications_for_spec(pkg.spec)) env.extend(uenv.environment_modifications_for_spec(pkg.spec))
env.extend(
modifications_from_dependencies(pkg.spec, context=context)
)
set_module_variables_for_package(pkg) set_module_variables_for_package(pkg)
env.prepend_path('PATH', '.') env.prepend_path('PATH', '.')
@ -814,7 +817,8 @@ def modifications_from_dependencies(spec, context):
} }
deptype, method = deptype_and_method[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 dpkg = dspec.package
set_module_variables_for_package(dpkg) set_module_variables_for_package(dpkg)
# Allow dependencies to modify the module # Allow dependencies to modify the module

5
var/spack/repos/builtin/packages/hdf5/package.py
View File

@ -20,6 +20,8 @@ class Hdf5(AutotoolsPackage):
git = "https://bitbucket.hdfgroup.org/scm/hdffv/hdf5.git" git = "https://bitbucket.hdfgroup.org/scm/hdffv/hdf5.git"
maintainers = ['lrknox'] maintainers = ['lrknox']
test_requires_compiler = True
version('develop', branch='develop') version('develop', branch='develop')
version('1.12.0', sha256='a62dcb276658cb78e6795dd29bf926ed7a9bc4edf6e77025cd2c689a8f97c17a') version('1.12.0', sha256='a62dcb276658cb78e6795dd29bf926ed7a9bc4edf6e77025cd2c689a8f97c17a')
@ -426,5 +428,4 @@ def test(self):
self._test_example() self._test_example()
# Run existing install check # Run existing install check
# TODO: Restore once address built vs. installed state self._check_install()
# self._check_install()