diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-05-20 11:52:45 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-05-20 12:13:39 +0200 |
| commit | dbc31ab25c355eae373e1766b4a77fccbe462bf3 (patch) | |
| tree | badd7863749d9f3783eae95a33751abf0bfe0857 /tests/guix-package.sh | |
| parent | 755e1147aa33d1c305bb9db6c5e03cf1063079fc (diff) | |
| download | patches-dbc31ab25c355eae373e1766b4a77fccbe462bf3.tar patches-dbc31ab25c355eae373e1766b4a77fccbe462bf3.tar.gz | |
guix package: Add optional argument to --search-paths.
* guix/scripts/package.scm (search-path-environment-variables): Add #:kind
parameter. Pass it to 'environment-variable-definition'.
(display-search-paths): Add #:kind parameter and pass it to
'search-path-environment-variables'.
(%options): Add an optional parameter for "--search-paths".
(guix-package)[process-query]: Handle it.
* tests/guix-package-net.sh: Adjust existing test.
* tests/guix-package.sh: Adjust existing tests and add new test.
* doc/guix.texi (Invoking guix package): Document it.
Diffstat (limited to 'tests/guix-package.sh')
| -rw-r--r-- | tests/guix-package.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/guix-package.sh b/tests/guix-package.sh index a732110d5c..d420b8076d 100644 --- a/tests/guix-package.sh +++ b/tests/guix-package.sh @@ -52,8 +52,13 @@ test -L "$profile" && test -L "$profile-1-link" test -f "$profile/bin/guile" # No search path env. var. here. -guix package --search-paths -p "$profile" -test "`guix package --search-paths -p "$profile" | wc -l`" = 0 +guix package -p "$profile" --search-paths +guix package -p "$profile" --search-paths | grep '^export PATH=' +test "`guix package -p "$profile" --search-paths | wc -l`" = 1 # $PATH +( set -e; set -x; \ + eval `guix package --search-paths=prefix -p "$PWD/$profile"`; \ + test "`type -P guile`" = "$PWD/$profile/bin/guile" ; \ + type -P rm ) # Exit with 1 when a generation does not exist. if guix package -p "$profile" --delete-generations=42; |