01/02: tests: Make sure %BOOTSTRAP-GUILE is available when we need it.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 49c0a8d6b6c241a8e7ba68eed98ad3fe6eaef381
Author: Ludovic Courtès <address@hidden>
Date:   Wed May 27 09:36:43 2015 +0200

    tests: Make sure %BOOTSTRAP-GUILE is available when we need it.
    
    * tests/derivations.scm ("derivation-prerequisites and
      valid-derivation-input?"): Renamed from "derivation-prerequisites and
      derivation-input-is-valid?".  Build %BOOTSTRAP-GUILE.  This fixes a
      regression introduced in cdb5b07 when running the whole test suite.
---
 tests/derivations.scm |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/derivations.scm b/tests/derivations.scm
index a8cccac..df5f07d 100644
--- a/tests/derivations.scm
+++ b/tests/derivations.scm
@@ -499,12 +499,16 @@
            (string=? path (derivation-file-name (%guile-for-build)))))
          (derivation-prerequisites drv))))
 
-(test-assert "derivation-prerequisites and derivation-input-is-valid?"
+(test-assert "derivation-prerequisites and valid-derivation-input?"
   (let* ((a (build-expression->derivation %store "a" '(mkdir %output)))
          (b (build-expression->derivation %store "b" `(list ,(random-text))))
          (c (build-expression->derivation %store "c" `(mkdir %output)
                                           #:inputs `(("a" ,a) ("b" ,b)))))
-    (build-derivations %store (list a))
+    ;; Make sure both A and %BOOTSTRAP-GUILE are built (the latter could have
+    ;; be removed by tests/guix-gc.sh.)
+    (build-derivations %store
+                       (list a (package-derivation %store %bootstrap-guile)))
+
     (match (derivation-prerequisites c
                                      (cut valid-derivation-input? %store
                                           <>))