diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-01-22 22:42:57 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-01-23 22:23:41 +0100 |
| commit | fcd75bdbfa99d14363b905afbf914eec20e69df8 (patch) | |
| tree | 38f9cfaf9c186fc6c9af54183efbd02fa1a13f70 /tests/search-paths.scm | |
| parent | c5746f239964a72642ac56640b8ff490d5bfa673 (diff) | |
search-paths: Allow specs with #f as their separator.
This adds support for single-entry search paths.
Fixes <http://bugs.gnu.org/25422>.
Reported by Leo Famulari <leo@famulari.name>.
* guix/search-paths.scm (<search-path-specification>)[separator]:
Document as string or #f.
(evaluate-search-paths): Add case for SEPARATOR as #f.
(environment-variable-definition): Handle SEPARATOR being #f.
* guix/build/utils.scm (list->search-path-as-string): Add case for
SEPARATOR as #f.
(search-path-as-string->list): Likewise.
* guix/build/profiles.scm (abstract-profile): Likewise.
* tests/search-paths.scm: New file.
* Makefile.am (SCM_TESTS): Add it.
* tests/packages.scm ("--search-paths with single-item search path"):
New test.
* gnu/packages/version-control.scm (git)[native-search-paths](separator):
New field.
Diffstat (limited to 'tests/search-paths.scm')
| -rw-r--r-- | tests/search-paths.scm | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/tests/search-paths.scm b/tests/search-paths.scm new file mode 100644 index 00000000000..2a4c18dd768 --- /dev/null +++ b/tests/search-paths.scm | |||
| @@ -0,0 +1,48 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | ||
| 2 | ;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> | ||
| 3 | ;;; | ||
| 4 | ;;; This file is part of GNU Guix. | ||
| 5 | ;;; | ||
| 6 | ;;; GNU Guix is free software; you can redistribute it and/or modify it | ||
| 7 | ;;; under the terms of the GNU General Public License as published by | ||
| 8 | ;;; the Free Software Foundation; either version 3 of the License, or (at | ||
| 9 | ;;; your option) any later version. | ||
| 10 | ;;; | ||
| 11 | ;;; GNU Guix is distributed in the hope that it will be useful, but | ||
| 12 | ;;; WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 14 | ;;; GNU General Public License for more details. | ||
| 15 | ;;; | ||
| 16 | ;;; You should have received a copy of the GNU General Public License | ||
| 17 | ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. | ||
| 18 | |||
| 19 | (define-module (test-search-paths) | ||
| 20 | #:use-module (guix search-paths) | ||
| 21 | #:use-module (ice-9 match) | ||
| 22 | #:use-module (srfi srfi-64)) | ||
| 23 | |||
| 24 | (define %top-srcdir | ||
| 25 | (dirname (search-path %load-path "guix.scm"))) | ||
| 26 | |||
| 27 | |||
| 28 | (test-begin "search-paths") | ||
| 29 | |||
| 30 | (test-equal "evaluate-search-paths, separator is #f" | ||
| 31 | (string-append %top-srcdir | ||
| 32 | "/gnu/packages/bootstrap/armhf-linux") | ||
| 33 | |||
| 34 | ;; The following search path spec should evaluate to a single item: the | ||
| 35 | ;; first directory that matches the "-linux$" pattern in | ||
| 36 | ;; gnu/packages/bootstrap. | ||
| 37 | (let ((spec (search-path-specification | ||
| 38 | (variable "CHBOUIB") | ||
| 39 | (files '("gnu/packages/bootstrap")) | ||
| 40 | (file-type 'directory) | ||
| 41 | (separator #f) | ||
| 42 | (file-pattern "-linux$")))) | ||
| 43 | (match (evaluate-search-paths (list spec) | ||
| 44 | (list %top-srcdir)) | ||
| 45 | (((spec* . value)) | ||
| 46 | (and (eq? spec* spec) value))))) | ||
| 47 | |||
| 48 | (test-end "search-paths") | ||
