diff options
| author | Ludovic Courtès <ludovic.courtes@inria.fr> | 2018-09-18 10:21:28 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-09-21 17:04:37 +0200 |
| commit | 811b21fb15d36b06fde994ca7ef5916a9a19f250 (patch) | |
| tree | 4dd6c27925dab39c7b6373cf97cca258813e56e2 /tests | |
| parent | 2e6d64e122ad2745154a38122785895d1b66c2ff (diff) | |
profiles: 'packages->manifest' now accepts inferior packages.
* guix/profiles.scm (packages->manifest)[inferiors-loaded?]: New
variable.
[inferior->entry]: New procedure.
Accept inferior packages when INFERIORS-LOADED? is true.
* tests/guix-package.sh: Add test using a manifest with an inferior.
* tests/inferior.scm ("packages->manifest"): New test.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/guix-package.sh | 15 | ||||
| -rw-r--r-- | tests/inferior.scm | 11 |
2 files changed, 26 insertions, 0 deletions
diff --git a/tests/guix-package.sh b/tests/guix-package.sh index cef3b3452e3..f7dfbfad002 100644 --- a/tests/guix-package.sh +++ b/tests/guix-package.sh | |||
| @@ -358,6 +358,21 @@ EOF | |||
| 358 | guix package --bootstrap -m "$module_dir/manifest.scm" | 358 | guix package --bootstrap -m "$module_dir/manifest.scm" |
| 359 | guix package -I | grep guile | 359 | guix package -I | grep guile |
| 360 | test `guix package -I | wc -l` -eq 1 | 360 | test `guix package -I | wc -l` -eq 1 |
| 361 | guix package --rollback --bootstrap | ||
| 362 | |||
| 363 | # Applying a manifest file with inferior packages. | ||
| 364 | cat > "$module_dir/manifest.scm"<<EOF | ||
| 365 | (use-modules (guix inferior)) | ||
| 366 | |||
| 367 | (define i | ||
| 368 | (open-inferior "$abs_top_srcdir" #:command "scripts/guix")) | ||
| 369 | |||
| 370 | (let ((guile (car (lookup-inferior-packages i "guile-bootstrap")))) | ||
| 371 | (packages->manifest (list guile))) | ||
| 372 | EOF | ||
| 373 | guix package --bootstrap -m "$module_dir/manifest.scm" | ||
| 374 | guix package -I | grep guile | ||
| 375 | test `guix package -I | wc -l` -eq 1 | ||
| 361 | 376 | ||
| 362 | # Error reporting. | 377 | # Error reporting. |
| 363 | cat > "$module_dir/manifest.scm"<<EOF | 378 | cat > "$module_dir/manifest.scm"<<EOF |
diff --git a/tests/inferior.scm b/tests/inferior.scm index 6f6abd28a18..d1d5c00a773 100644 --- a/tests/inferior.scm +++ b/tests/inferior.scm | |||
| @@ -182,4 +182,15 @@ | |||
| 182 | (close-inferior inferior) | 182 | (close-inferior inferior) |
| 183 | (manifest-entry->list entry))) | 183 | (manifest-entry->list entry))) |
| 184 | 184 | ||
| 185 | (test-equal "packages->manifest" | ||
| 186 | (map manifest-entry->list | ||
| 187 | (manifest-entries (packages->manifest | ||
| 188 | (find-best-packages-by-name "guile" #f)))) | ||
| 189 | (let* ((inferior (open-inferior %top-builddir | ||
| 190 | #:command "scripts/guix")) | ||
| 191 | (guile (first (lookup-inferior-packages inferior "guile"))) | ||
| 192 | (manifest (packages->manifest (list guile)))) | ||
| 193 | (close-inferior inferior) | ||
| 194 | (map manifest-entry->list (manifest-entries manifest)))) | ||
| 195 | |||
| 185 | (test-end "inferior") | 196 | (test-end "inferior") |
