[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: hydra: Fix the construction of system test jobs.
From: |
Ludovic Courtès |
Subject: |
02/02: hydra: Fix the construction of system test jobs. |
Date: |
Tue, 21 Jun 2016 13:59:27 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit ab23fb83c2ddc38cbcc2751814efe7b385b36c56
Author: Ludovic Courtès <address@hidden>
Date: Tue Jun 21 15:52:10 2016 +0200
hydra: Fix the construction of system test jobs.
* build-aux/hydra/gnu-system.scm (system-test-jobs)[test->thunk]: New
procedure.
[->job]: Use it.
---
build-aux/hydra/gnu-system.scm | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index 50e1661..a84cdeb 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -173,17 +173,29 @@ system.")
(define (system-test-jobs store system)
"Return a list of jobs for the system tests."
+ (define (test->thunk test)
+ (lambda ()
+ (define drv
+ (run-with-store store
+ (mbegin %store-monad
+ (set-current-system system)
+ (set-grafting #f)
+ (set-guile-for-build (default-guile))
+ (system-test-value test))))
+
+ `((derivation . ,(derivation-file-name drv))
+ (description . ,(format #f "GuixSD '~a' system test"
+ (system-test-name test)))
+ (long-description . ,(system-test-description test))
+ (license . ,gpl3+)
+ (home-page . ,%guix-home-page-url)
+ (maintainers . ("address@hidden")))))
+
(define (->job test)
(let ((name (string->symbol
(string-append "test." (system-test-name test)
"." system))))
- `(,name . ,(lambda ()
- (run-with-store store
- (mbegin %store-monad
- (set-current-system system)
- (set-grafting #f)
- (set-guile-for-build (default-guile))
- (system-test-value test)))))))
+ (cons name (test->thunk test))))
(if (member system %guixsd-supported-systems)
(map ->job (all-system-tests))