01/01: tests: Update %bootstrap-inputs to support Reduced Binary Seed bootstrap.

[Jan Nieuwenhuizen]

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

commit bffa03d5af00efb5a1b9a9bb2332fed498799d69
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Sun Sep 23 08:46:58 2018 +0200

    tests: Update %bootstrap-inputs to support Reduced Binary Seed bootstrap.
    
    This fixes the "union-build" test.  The test now passes but this builds most
    of mes bootstrap in ./test-tmp, which takes quite a bit of time.
    
    * tests/union.scm (%bootstrap-inputs): New variable: set to
    %bootstrap-inputs+toolchain to support Reduced Binary Seed bootstrap too.
---
 tests/union.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/union.scm b/tests/union.scm
index 39d06cf..f6399a1 100644
--- a/tests/union.scm
+++ b/tests/union.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2018 Ludovic Courtès 
<address@hidden>
+;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -25,12 +26,14 @@
   #:use-module (guix build union)
   #:use-module ((guix build utils)
                 #:select (with-directory-excursion directory-exists?))
-  #:use-module (gnu packages bootstrap)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-64)
   #:use-module (rnrs io ports)
   #:use-module (ice-9 match))
 
+(define %bootstrap-inputs
+  (@@ (gnu packages commencement) %bootstrap-inputs+toolchain))
+
 ;; Exercise the (guix build union) module.
 
 (define %store
@@ -94,8 +97,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")