diff options
author | Ludovic Courtès <ludo@gnu.org> | 2017-01-18 16:57:56 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2017-01-19 00:11:15 +0100 |
commit | 840f38ba37af1d09eb1e896a6350d6ab7f6532d0 (patch) | |
tree | 2439b051b3b081f26e26ca368ed16642f57c9b56 /tests | |
parent | 67fee545cc0090cf9db7bc61fb74d30dadbd9973 (diff) | |
download | patches-840f38ba37af1d09eb1e896a6350d6ab7f6532d0.tar patches-840f38ba37af1d09eb1e896a6350d6ab7f6532d0.tar.gz |
guix environment, build: Allow absolute file names with '--root'.
Reported by Chris Webber.
* guix/scripts/build.scm (register-root): If ROOT is absolute, keep it
as is.
* guix/scripts/environment.scm (register-gc-root): Likewise.
* tests/guix-environment.sh (expected): Add test.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/guix-environment.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh index 2b3bbfe036..9115949123 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 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> # # This file is part of GNU Guix. # @@ -74,7 +74,12 @@ test `readlink "$gcroot"` = "$expected" guix environment --bootstrap -r "$gcroot" --ad-hoc guile-bootstrap \ -- guile -c 1 test `readlink "$gcroot"` = "$expected" +rm "$gcroot" +# Same with an absolute file name. +guix environment --bootstrap -r "$PWD/$gcroot" --ad-hoc guile-bootstrap \ + -- guile -c 1 +test `readlink "$gcroot"` = "$expected" case "`uname -m`" in x86_64) |