me
/
guix
Archived
1
0
Fork 0
Code

build-system/gnu: Support parallel builds and tests. 

* guix/build/gnu-build-system.scm (build): Add `parallel-build?'
  parameter; honor it and $NIX_BUILD_CORES.
  (check): Add `parallel-tests?' parameter; likewise.

* guix/build-system/gnu.scm (gnu-build): Add `parallel-build?' and
  `parallel-tests?' parameters.
  [builder]: Inherit them.
master
Ludovic Courtès 2012-07-07 16:49:23 +02:00
parent 10c87717bd
commit febaa88569
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
guix/build-system/gnu.scm
View File

@ -45,6 +45,7 @@
#:key (outputs '("out")) (configure-flags ''()) #:key (outputs '("out")) (configure-flags ''())
(make-flags ''()) (make-flags ''())
(patches ''()) (patch-flags ''("--batch" "-p1")) (patches ''()) (patch-flags ''("--batch" "-p1"))
(parallel-build? #t) (parallel-tests? #t)
(phases '%standard-phases) (phases '%standard-phases)
(system (%current-system)) (system (%current-system))
(modules '((guix build gnu-build-system) (modules '((guix build gnu-build-system)
@ -63,7 +64,9 @@ input derivation INPUTS, using the usual procedure of the GNU Build System."
#:patch-flags ,patch-flags #:patch-flags ,patch-flags
#:phases ,phases #:phases ,phases
#:configure-flags ,configure-flags #:configure-flags ,configure-flags
#:make-flags ,make-flags))) #:make-flags ,make-flags
#:parallel-build? ,parallel-build?
#:parallel-tests? ,parallel-tests?)))
(build-expression->derivation store name system (build-expression->derivation store name system
builder builder

16
guix/build/gnu-build-system.scm
View File

@ -87,13 +87,23 @@
(format #t "configure flags: ~s~%" flags) (format #t "configure flags: ~s~%" flags)
(zero? (apply system* "./configure" flags)))) (zero? (apply system* "./configure" flags))))
(define* (build #:key (make-flags '()) #:allow-other-keys) (define* (build #:key (make-flags '()) (parallel-build? #t)
(zero? (apply system* "make" make-flags))) #:allow-other-keys)
(zero? (apply system* "make"
`(,@(if parallel-build?
`("-j" ,(getenv "NIX_BUILD_CORES"))
'())
,@make-flags))))
(define* (check #:key (make-flags '()) (tests? #t) (test-target "check") (define* (check #:key (make-flags '()) (tests? #t) (test-target "check")
(parallel-tests? #t)
#:allow-other-keys) #:allow-other-keys)
(if tests? (if tests?
(zero? (apply system* "make" test-target make-flags)) (zero? (apply system* "make" test-target
`(,@(if parallel-tests?
`("-j" ,(getenv "NIX_BUILD_CORES"))
'())
,@make-flags)))
(begin (begin
(format #t "test suite not run~%") (format #t "test suite not run~%")
#t))) #t)))