diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-06-21 15:52:10 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-06-21 15:59:06 +0200 |
| commit | ab23fb83c2ddc38cbcc2751814efe7b385b36c56 (patch) | |
| tree | beba24593d66bb4f3d18af73a3ff2d8d014f617a | |
| parent | 4c9243b688b4df2310b7fba65ef53e2f52f76bce (diff) | |
| download | guix-ab23fb83c2ddc38cbcc2751814efe7b385b36c56.tar.gz | |
hydra: Fix the construction of system test jobs.
* build-aux/hydra/gnu-system.scm (system-test-jobs)[test->thunk]: New procedure. [->job]: Use it.
| -rw-r--r-- | build-aux/hydra/gnu-system.scm | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index 50e1661d3b..a84cdebbad 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 . ("bug-guix@gnu.org"))))) + (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)) |