me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Ludovic Courtès 2015-05-27 09:36:43 +02:00
parent 07eaecfae1
commit 49c0a8d6b6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/derivations.scm
View File

@ -499,12 +499,16 @@
(string=? path (derivation-file-name (%guile-for-build))))) (string=? path (derivation-file-name (%guile-for-build)))))
(derivation-prerequisites drv)))) (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))) (let* ((a (build-expression->derivation %store "a" '(mkdir %output)))
(b (build-expression->derivation %store "b" `(list ,(random-text)))) (b (build-expression->derivation %store "b" `(list ,(random-text))))
(c (build-expression->derivation %store "c" `(mkdir %output) (c (build-expression->derivation %store "c" `(mkdir %output)
#:inputs `(("a" ,a) ("b" ,b))))) #: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 (match (derivation-prerequisites c
(cut valid-derivation-input? %store (cut valid-derivation-input? %store
<>)) <>))