From ab23fb83c2ddc38cbcc2751814efe7b385b36c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 21 Jun 2016 15:52:10 +0200
Subject: [PATCH] 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 50e1661d3b..a84cdebbad 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -173,17 +173,29 @@ (define MiB
 
 (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))