1de2fe95e0
This allows for direct program invokation without needing a shell to act
as a command interpreter.
* guix/scripts/environment.scm (%default-shell): New variable.
(show-help): Adjust description. Remove '--exec' reference.
(%default-options): Use '%default-shell'.
(%options): Adjust '--exec' to run command via the default shell.
(parse-args): New procedure.
(guix-environment): Use 'parse-args'. Use 'system*' instead of
'system'.
* tests/guix-environment.sh: Add test for '--' command invokation.
* doc/guix.texi ("Invoking guix environment"): Use new syntax. Remove
'--exec' documentation.
101 lines
3.7 KiB
Bash
101 lines
3.7 KiB
Bash
# GNU Guix --- Functional package management for GNU
|
|
# Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
|
|
#
|
|
# This file is part of GNU Guix.
|
|
#
|
|
# GNU Guix is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or (at
|
|
# your option) any later version.
|
|
#
|
|
# GNU Guix is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
#
|
|
# Test 'guix environment'.
|
|
#
|
|
|
|
set -e
|
|
|
|
guix environment --version
|
|
|
|
tmpdir="t-guix-environment-$$"
|
|
trap 'rm -r "$tmpdir"' EXIT
|
|
|
|
mkdir "$tmpdir"
|
|
|
|
# Check the environment variables for the bootstrap Guile.
|
|
guix environment --ad-hoc guile-bootstrap --pure --search-paths > "$tmpdir/a"
|
|
guix environment --ad-hoc guile-bootstrap:out --pure --search-paths > "$tmpdir/b"
|
|
|
|
# $PATH must appear in the search paths, and nothing else.
|
|
grep -E '^export PATH=.*guile-bootstrap-[0-9.]+/bin' "$tmpdir/a"
|
|
test "`wc -l < "$tmpdir/a"`" = 1
|
|
|
|
cmp "$tmpdir/a" "$tmpdir/b"
|
|
|
|
# Make sure the exit value is preserved.
|
|
if guix environment --ad-hoc guile-bootstrap --pure -- guile -c '(exit 42)'
|
|
then
|
|
false
|
|
else
|
|
test $? = 42
|
|
fi
|
|
|
|
# Same as above, but with deprecated -E flag.
|
|
if guix environment --ad-hoc guile-bootstrap --pure -E "guile -c '(exit 42)'"
|
|
then
|
|
false
|
|
else
|
|
test $? = 42
|
|
fi
|
|
|
|
if guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/null
|
|
then
|
|
# Compute the build environment for the initial GNU Make.
|
|
guix environment -e '(@@ (gnu packages commencement) gnu-make-boot0)' \
|
|
--no-substitutes --search-paths --pure > "$tmpdir/a"
|
|
|
|
# Make sure the bootstrap binaries are all listed where they belong.
|
|
grep -E '^export PATH=.*-bootstrap-binaries-0/bin' "$tmpdir/a"
|
|
grep -E '^export CPATH=.*-gcc-bootstrap-0/include' "$tmpdir/a"
|
|
grep -E '^export CPATH=.*-glibc-bootstrap-0/include' "$tmpdir/a"
|
|
grep -E '^export LIBRARY_PATH=.*-glibc-bootstrap-0/lib' "$tmpdir/a"
|
|
|
|
# 'make-boot0' itself must not be listed.
|
|
if grep "make-boot0" "$tmpdir/a"; then false; else true; fi
|
|
|
|
# Make sure that the shell spawned with '--exec' sees the same environment
|
|
# as returned by '--search-paths'.
|
|
guix environment -e '(@@ (gnu packages commencement) gnu-make-boot0)' \
|
|
--no-substitutes --pure \
|
|
-- /bin/sh -c 'echo $PATH $CPATH $LIBRARY_PATH' > "$tmpdir/b"
|
|
( . "$tmpdir/a" ; echo $PATH $CPATH $LIBRARY_PATH ) > "$tmpdir/c"
|
|
cmp "$tmpdir/b" "$tmpdir/c"
|
|
|
|
rm "$tmpdir"/*
|
|
|
|
# Compute the build environment for the initial GNU Findutils.
|
|
guix environment -e '(@@ (gnu packages commencement) findutils-boot0)' \
|
|
--no-substitutes --search-paths --pure > "$tmpdir/a"
|
|
|
|
# Make sure the bootstrap binaries are all listed where they belong.
|
|
grep -E '^export PATH=.*-bootstrap-binaries-0/bin' "$tmpdir/a"
|
|
grep -E '^export PATH=.*-make-boot0-[0-9.]+/bin' "$tmpdir/a"
|
|
grep -E '^export CPATH=.*-gcc-bootstrap-0/include' "$tmpdir/a"
|
|
grep -E '^export CPATH=.*-glibc-bootstrap-0/include' "$tmpdir/a"
|
|
grep -E '^export LIBRARY_PATH=.*-glibc-bootstrap-0/lib' "$tmpdir/a"
|
|
|
|
# The following test assumes 'make-boot0' has a "debug" output.
|
|
make_boot0_debug="`guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)' | grep -e -debug`"
|
|
test "x$make_boot0_debug" != "x"
|
|
|
|
# Make sure the "debug" output is not listed.
|
|
if grep -E "$make_boot0_debug" "$tmpdir/a"; then false; else true; fi
|
|
fi
|