01/01: test: Fix "gnu-build-system" test.

[Jan Nieuwenhuizen]

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 679c0ce888c36b1a9056b605154e3dca88cf5d36
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Sat Sep 22 19:58:11 2018 +0200

    test: Fix "gnu-build-system" test.
    
    The test now passes but this builds most of mes bootstrap in ./test-tmp, 
which
    takes quite a bit of time.
    
    * tests/builders.scm (%bootstrap-inputs): Really filter on package?
    (%bootstrap-search-paths): Make a procedure.  Filter on package?  Update
    users.
---
 tests/builders.scm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/builders.scm b/tests/builders.scm
index 324e9d0..b2d8a7c 100644
--- a/tests/builders.scm
+++ b/tests/builders.scm
@@ -48,15 +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)))
-              (filter package?
-                      ((@@ (gnu packages commencement) %boot0-inputs)))))
+              (filter
+               (compose package? cadr)
+               ((@@ (gnu packages commencement) %boot0-inputs)))))
 
 (define url-fetch*
   (store-lower url-fetch))
@@ -106,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)