tests: Make sure %BOOTSTRAP-GUILE is available when we need it.
authorLudovic Courtès <ludo@gnu.org>
Wed, 27 May 2015 07:36:43 +0000 (09:36 +0200)
committerLudovic Courtès <ludo@gnu.org>
Wed, 27 May 2015 07:36:43 +0000 (09:36 +0200)
* 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

index a8cccac..df5f07d 100644 (file)
            (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
                                           <>))