diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-02-20 17:01:39 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-20 17:01:39 +0100 |
| commit | 2c76e19df4b0b4aa0171f1edd9f240f7b6ba5b84 (patch) | |
| tree | c2e7a7f27dd9c7e704f2e78655328c903a6934d1 /tests/guix-environment.sh | |
| parent | e6a668ec7303a71f87e4c9354b1458e555058c63 (diff) | |
| parent | 78b2eb1ad3dcf05c25e0ee4980c97aa52de03a2d (diff) | |
| download | guix-2c76e19df4b0b4aa0171f1edd9f240f7b6ba5b84.tar.gz guix-2c76e19df4b0b4aa0171f1edd9f240f7b6ba5b84.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'tests/guix-environment.sh')
| -rw-r--r-- | tests/guix-environment.sh | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh index 30b21028aa..ccbe027c7b 100644 --- a/tests/guix-environment.sh +++ b/tests/guix-environment.sh @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> # # This file is part of GNU Guix. # @@ -49,6 +49,19 @@ test -x `sed -r 's/^export PATH="(.*)"/\1/' "$tmpdir/a"`/guile cmp "$tmpdir/a" "$tmpdir/b" +# Check '--inherit'. +GUIX_TEST_ABC=1 +GUIX_TEST_DEF=2 +GUIX_TEST_XYZ=3 +export GUIX_TEST_ABC GUIX_TEST_DEF GUIX_TEST_XYZ +guix environment --bootstrap --ad-hoc guile-bootstrap --pure \ + --inherit='^GUIX_TEST_A' --inherit='^GUIX_TEST_D' \ + -- "$SHELL" -c set > "$tmpdir/a" +grep '^PATH=' "$tmpdir/a" +grep '^GUIX_TEST_ABC=' "$tmpdir/a" +grep '^GUIX_TEST_DEF=' "$tmpdir/a" +if grep '^GUIX_TEST_XYZ=' "$tmpdir/a"; then false; else true; fi + # Make sure the exit value is preserved. if guix environment --bootstrap --ad-hoc guile-bootstrap --pure \ -- guile -c '(exit 42)' |