summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/builders.scm23
-rw-r--r--tests/graph.scm4
-rw-r--r--tests/union.scm5
3 files changed, 19 insertions, 13 deletions
diff --git a/tests/builders.scm b/tests/builders.scm
index 8b8ef013e7..b2d8a7c6b2 100644
--- a/tests/builders.scm
+++ b/tests/builders.scm
@@ -28,7 +28,8 @@
#:use-module (gcrypt hash)
#:use-module (guix tests)
#:use-module ((guix packages)
- #:select (package-derivation package-native-search-paths))
+ #:select (package?
+ package-derivation package-native-search-paths))
#:use-module (gnu packages bootstrap)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
@@ -39,7 +40,7 @@
(define %store
(open-connection-for-tests))
-(define %bootstrap-inputs
+(define (%bootstrap-inputs)
;; Use the bootstrap inputs so it doesn't take ages to run these tests.
;; This still involves building Make, Diffutils, and Findutils.
;; XXX: We're relying on the higher-level `package-derivations' here.
@@ -47,14 +48,18 @@
(map (match-lambda
((name package)
(list name (package-derivation %store package))))
- (@@ (gnu packages commencement) %boot0-inputs))))
+ (filter
+ (compose package? cadr)
+ ((@@ (gnu packages commencement) %boot0-inputs))))))
-(define %bootstrap-search-paths
+(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 commencement) %boot0-inputs)))
+ ((name package _ ...)
+ (package-native-search-paths package)))
+ (filter
+ (compose package? cadr)
+ ((@@ (gnu packages commencement) %boot0-inputs)))))
(define url-fetch*
(store-lower url-fetch))
@@ -104,9 +109,9 @@
#:guile %bootstrap-guile))
(build (gnu-build %store "hello-2.8"
`(("source" ,tarball)
- ,@%bootstrap-inputs)
+ ,@(%bootstrap-inputs))
#:guile %bootstrap-guile
- #:search-paths %bootstrap-search-paths))
+ #:search-paths (%bootstrap-search-paths)))
(out (derivation->output-path build)))
(and (build-derivations %store (list (pk 'hello-drv build)))
(valid-path? %store out)
diff --git a/tests/graph.scm b/tests/graph.scm
index 4799d3bd0c..2a0f675717 100644
--- a/tests/graph.scm
+++ b/tests/graph.scm
@@ -153,9 +153,9 @@ edges."
(match nodes
(((labels names) ...)
names))))
- (match %bootstrap-inputs
+ (match (%bootstrap-inputs)
(((labels packages) ...)
- (map package-full-name packages))))))))
+ (map package-full-name (filter package? packages)))))))))
(test-assert "bag DAG, including origins"
(let-values (((backend nodes+edges) (make-recording-backend)))
diff --git a/tests/union.scm b/tests/union.scm
index 5a6a4033fc..5599625447 100644
--- a/tests/union.scm
+++ b/tests/union.scm
@@ -94,8 +94,9 @@
`(,name ,(package-derivation %store package))))
;; Purposefully leave duplicate entries.
- (append %bootstrap-inputs
- (take %bootstrap-inputs 3))))
+ (filter (compose package? cadr)
+ (append (%bootstrap-inputs)
+ (take (%bootstrap-inputs) 3)))))
(builder `(begin
(use-modules (guix build union))
(union-build (assoc-ref %outputs "out")