From d0dfa1ea4d844d87efa68a69053b813c4377c557 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Fri, 1 May 2020 09:37:21 -0700 Subject: dev-build: --drop-in (#14887) * dev-build: --drop-in Add a `--drop-in ` option to `spack dev-build`. This option will automatically run a `spack build-env -- ` at the end of a `dev-build`, e.g. to quickly drop-and-devel into a build phase of a package. Example usage: ``` spack dev-build --before cmake --drop-in bash openpmd-api@develop ``` * build_env: drop in unit test Co-authored-by: Greg Becker --- lib/spack/spack/cmd/dev_build.py | 8 ++++++++ lib/spack/spack/test/cmd/dev_build.py | 11 +++++++++++ 2 files changed, 19 insertions(+) (limited to 'lib') diff --git a/lib/spack/spack/cmd/dev_build.py b/lib/spack/spack/cmd/dev_build.py index 7f42492808..d9ad0fb891 100644 --- a/lib/spack/spack/cmd/dev_build.py +++ b/lib/spack/spack/cmd/dev_build.py @@ -37,6 +37,9 @@ def setup_parser(subparser): subparser.add_argument( '-q', '--quiet', action='store_true', dest='quiet', help="do not display verbose build output while installing") + subparser.add_argument( + '--drop-in', type=str, dest='shell', default=None, + help="drop into a build environment in a new shell, e.g. bash, zsh") arguments.add_common_arguments(subparser, ['spec']) stop_group = subparser.add_mutually_exclusive_group() @@ -98,3 +101,8 @@ def dev_build(self, args): dirty=args.dirty, stop_before=args.before, stop_at=args.until) + + # drop into the build environment of the package? + if args.shell is not None: + spack.build_environment.setup_package(package, dirty=False) + os.execvp(args.shell, [args.shell]) diff --git a/lib/spack/spack/test/cmd/dev_build.py b/lib/spack/spack/test/cmd/dev_build.py index 6afd07d815..5a7dfc273c 100644 --- a/lib/spack/spack/test/cmd/dev_build.py +++ b/lib/spack/spack/test/cmd/dev_build.py @@ -76,6 +76,17 @@ def test_dev_build_before_until(tmpdir, mock_packages, install_mockery): 'dev-build-test-install@0.0.0') +def test_dev_build_drop_in(tmpdir, mock_packages, monkeypatch, + install_mockery): + def print_spack_cc(*args): + # Eat arguments and print environment variable to test + print(os.environ['CC']) + monkeypatch.setattr(os, 'execvp', print_spack_cc) + output = dev_build('-b', 'edit', '--drop-in', 'sh', + 'dev-build-test-install@0.0.0') + assert "lib/spack/env" in output + + def test_dev_build_fails_already_installed(tmpdir, mock_packages, install_mockery): spec = spack.spec.Spec('dev-build-test-install@0.0.0').concretized() -- cgit v1.2.3-60-g2f50