diff options
author | Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com> | 2019-08-06 17:11:23 -0700 |
---|---|---|
committer | Todd Gamblin <tgamblin@llnl.gov> | 2019-08-06 17:11:23 -0700 |
commit | 951d42596ba291b7b71e14a0000d06c0de1934a6 (patch) | |
tree | 353cbc346ae8dc178b83c37ab2e5aab3d0042e4f /lib | |
parent | 09d4fcc6ad89695429135479835c4f36853a4c93 (diff) | |
download | spack-951d42596ba291b7b71e14a0000d06c0de1934a6.tar.gz spack-951d42596ba291b7b71e14a0000d06c0de1934a6.tar.bz2 spack-951d42596ba291b7b71e14a0000d06c0de1934a6.tar.xz spack-951d42596ba291b7b71e14a0000d06c0de1934a6.zip |
tests: explain and test dependency flattening routines (#11993)
- Add comments to explain that `install_dependency_symlinks` and `flatten_dependencies` are actually used.
- Add a test that exercises the routines.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/spack/spack/package.py | 10 | ||||
-rw-r--r-- | lib/spack/spack/test/install.py | 35 |
2 files changed, 44 insertions, 1 deletions
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index e24e3fba14..742d83cb72 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -2361,7 +2361,15 @@ class Package(PackageBase): def install_dependency_symlinks(pkg, spec, prefix): - """Execute a dummy install and flatten dependencies""" + """ + Execute a dummy install and flatten dependencies. + + This routine can be used in a ``package.py`` definition by setting + ``install = install_dependency_symlinks``. + + This feature comes in handy for creating a common location for the + the installation of third-party libraries. + """ flatten_dependencies(spec, prefix) diff --git a/lib/spack/spack/test/install.py b/lib/spack/spack/test/install.py index e8467490fb..85e1c5050c 100644 --- a/lib/spack/spack/test/install.py +++ b/lib/spack/spack/test/install.py @@ -140,6 +140,41 @@ def test_installed_dependency_request_conflicts( dependent.concretize() +def test_install_dependency_symlinks_pkg( + install_mockery, mock_fetch, mutable_mock_packages): + """Test dependency flattening/symlinks mock package.""" + spec = Spec('flatten-deps') + spec.concretize() + pkg = spec.package + pkg.do_install() + + # Ensure dependency directory exists after the installation. + dependency_dir = os.path.join(pkg.prefix, 'dependency-install') + assert os.path.isdir(dependency_dir) + + +def test_flatten_deps( + install_mockery, mock_fetch, mutable_mock_packages): + """Explicitly test the flattening code for coverage purposes.""" + # Unfortunately, executing the 'flatten-deps' spec's installation does + # not affect code coverage results, so be explicit here. + spec = Spec('dependent-install') + spec.concretize() + pkg = spec.package + pkg.do_install() + + # Demonstrate that the directory does not appear under the spec + # prior to the flatten operation. + dependency_name = 'dependency-install' + assert dependency_name not in os.listdir(pkg.prefix) + + # Flatten the dependencies and ensure the dependency directory is there. + spack.package.flatten_dependencies(spec, pkg.prefix) + + dependency_dir = os.path.join(pkg.prefix, dependency_name) + assert os.path.isdir(dependency_dir) + + def test_installed_upstream_external( tmpdir_factory, install_mockery, mock_fetch, gen_mock_layout): """Check that when a dependency package is recorded as installed in |