diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-04-11 22:54:52 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-04-11 22:56:39 +0200 |
| commit | 7a88ad6bff385062dcc726a7a092ed60fb05b5da (patch) | |
| tree | 16bdb0029afef10e13827086a3cb00f5a88c70a9 /tests | |
| parent | 1010e530d38af0b87fced74267bb7864a213b158 (diff) | |
tests: Adjust `gnu-build' test to search path mechanism.
Fixes a regression introduced in a18eda2.
Reported by Nikita Karetnikov <nikita@karetnikov.org>.
* tests/builders.scm (%bootstrap-search-paths): New variable.
("gnu-build"): Pass #:search-paths.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/builders.scm | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/tests/builders.scm b/tests/builders.scm index 880dddd0b6..1e6b62ee6a 100644 --- a/tests/builders.scm +++ b/tests/builders.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,7 +25,8 @@ #:use-module (guix utils) #:use-module (guix base32) #:use-module (guix derivations) - #:use-module ((guix packages) #:select (package-derivation)) + #:use-module ((guix packages) + #:select (package-derivation package-native-search-paths)) #:use-module (gnu packages bootstrap) #:use-module (ice-9 match) #:use-module (srfi srfi-1) @@ -50,6 +51,13 @@ (list name (package-derivation %store package)))) (@@ (gnu packages base) %boot0-inputs)))) +(define %bootstrap-search-paths + ;; Search path specifications that go with %BOOTSTRAP-INPUTS. + (append-map (match-lambda + ((name package _ ...) + (package-native-search-paths package))) + (@@ (gnu packages base) %boot0-inputs))) + (define network-reachable? (false-if-exception (getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV))) @@ -83,7 +91,8 @@ (build (gnu-build %store "hello-2.8" tarball %bootstrap-inputs #:implicit-inputs? #f - #:guile %bootstrap-guile)) + #:guile %bootstrap-guile + #:search-paths %bootstrap-search-paths)) (out (derivation-path->output-path build))) (and (build-derivations %store (list (pk 'hello-drv build))) (valid-path? %store out) |