diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-04 22:31:59 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-04 22:31:59 +0100 |
| commit | 4f8dc1536adf5965597d53a1e7867690429a12b2 (patch) | |
| tree | 1d6456941b23316020c9f0edac8e22187134488d /tests | |
| parent | 19464173bafdc42adfc8dd7277c491c40ddef66b (diff) | |
| parent | 5ae458befc803fe357210fef343cf322d9f4bade (diff) | |
| download | guix-4f8dc1536adf5965597d53a1e7867690429a12b2.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/guix-environment.sh | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh index ccbe027c7b..7ea9c200de 100644 --- a/tests/guix-environment.sh +++ b/tests/guix-environment.sh @@ -49,13 +49,13 @@ test -x `sed -r 's/^export PATH="(.*)"/\1/' "$tmpdir/a"`/guile cmp "$tmpdir/a" "$tmpdir/b" -# Check '--inherit'. +# Check '--preserve'. 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' \ + --preserve='^GUIX_TEST_A' --preserve='^GUIX_TEST_D' \ -- "$SHELL" -c set > "$tmpdir/a" grep '^PATH=' "$tmpdir/a" grep '^GUIX_TEST_ABC=' "$tmpdir/a" @@ -117,16 +117,6 @@ case "`uname -m`" in ;; esac - -# Same as above, but with deprecated -E flag. -if guix environment --bootstrap --ad-hoc guile-bootstrap --pure \ - -E "guile -c '(exit 42)'" -then - false -else - test $? = 42 -fi - # Make sure we can build the environment of 'guix'. There may be collisions # in its profile (e.g., for 'gzip'), but we have to accept them. guix environment guix --bootstrap -n |