me
/
guix
Archived
1
0
Fork 0
Code

tests: Avoid 'delete-paths' calls for 'derivation-prerequisites-to-build'. 

* tests/derivations.scm ("derivation-prerequisites-to-build when outputs
already present"): Insert random text in BUILDER, and remove two calls
to 'delete-paths'.  Use 'derivation->output-path' for INPUT-PATH instead
of an old idiom.
master
Ludovic Courtès 2019-06-17 22:48:44 +02:00
parent a32e3b9078
commit 5c7f87881a
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/derivations.scm
View File

@ -816,20 +816,17 @@
(null? (derivation-prerequisites-to-build %store drv)))) (null? (derivation-prerequisites-to-build %store drv))))
(test-assert "derivation-prerequisites-to-build when outputs already present" (test-assert "derivation-prerequisites-to-build when outputs already present"
(let* ((builder '(begin (mkdir %output) #t)) (let* ((builder `(begin ,(random-text) (mkdir %output) #t))
(input-drv (build-expression->derivation %store "input" builder)) (input-drv (build-expression->derivation %store "input" builder))
(input-path (derivation-output-path (input-path (derivation->output-path input-drv))
(assoc-ref (derivation-outputs input-drv)
"out")))
(drv (build-expression->derivation %store "something" builder (drv (build-expression->derivation %store "something" builder
#:inputs #:inputs
`(("i" ,input-drv)))) `(("i" ,input-drv))))
(output (derivation->output-path drv))) (output (derivation->output-path drv)))
;; Make sure these things are not already built. ;; Assume these things are not already built.
(when (valid-path? %store input-path) (when (or (valid-path? %store input-path)
(delete-paths %store (list input-path))) (valid-path? %store output))
(when (valid-path? %store output) (error "things already built" input-drv))
(delete-paths %store (list output)))
(and (equal? (map derivation-input-path (and (equal? (map derivation-input-path
(derivation-prerequisites-to-build %store drv)) (derivation-prerequisites-to-build %store drv))