diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-01-09 23:20:25 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-01-11 10:13:32 +0100 |
| commit | 0602d92bb0cf4386946cc0e28ee4da47dbc06bd4 (patch) | |
| tree | 18bf5a41c6c65c2b148fc28207e644fdca5f9537 /tests/gexp.scm | |
| parent | ca9050d5177a82da63b4716f6b12c7c377a84961 (diff) | |
DRAFT gexp: Turn grafting into a build continuation.wip-gexp-grafts
TODO: See FIXME in gexp.scm.
* guix/gexp.scm (gexp->derivation): Rename 'graft?' local variable to
'prev-graft?' and call (set-grafting? #f) unconditionally. When GRAFT?
is true, call 'set-build-continuation' for DRV.
* guix/grafts.scm (graft-derivation*, graft-continuation): New
procedures.
* tests/gexp.scm ("gexp-grafts"): Remove test that is now obsolete.
Diffstat (limited to 'tests/gexp.scm')
| -rw-r--r-- | tests/gexp.scm | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/tests/gexp.scm b/tests/gexp.scm index ea4243a3a6..cb4e1c9487 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -434,25 +434,6 @@ (equal? refs (list (dirname (dirname guile)))) (equal? refs2 (list file)))))) -(test-assertm "gexp->derivation vs. grafts" - (mlet* %store-monad ((graft? (set-grafting #f)) - (p0 -> (dummy-package "dummy" - (arguments - '(#:implicit-inputs? #f)))) - (r -> (package (inherit p0) (name "DuMMY"))) - (p1 -> (package (inherit p0) (replacement r))) - (exp0 -> (gexp (frob (ungexp p0) (ungexp output)))) - (exp1 -> (gexp (frob (ungexp p1) (ungexp output)))) - (void (set-guile-for-build %bootstrap-guile)) - (drv0 (gexp->derivation "t" exp0 #:graft? #t)) - (drv1 (gexp->derivation "t" exp1 #:graft? #t)) - (drv1* (gexp->derivation "t" exp1 #:graft? #f)) - (_ (set-grafting graft?))) - (return (and (not (string=? (derivation->output-path drv0) - (derivation->output-path drv1))) - (string=? (derivation->output-path drv0) - (derivation->output-path drv1*)))))) - (test-assertm "gexp-grafts" ;; Make sure 'gexp-grafts' returns the graft to replace P1 by R. (let* ((p0 (dummy-package "dummy" |