From 4c9243b688b4df2310b7fba65ef53e2f52f76bce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 21 Jun 2016 15:50:51 +0200
Subject: [PATCH] hydra: 'evaluate' now validates job alists.
* build-aux/hydra/evaluate.scm (assert-valid-job): New procedure.
<top level>: Use it.
---
build-aux/hydra/evaluate.scm | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/build-aux/hydra/evaluate.scm b/build-aux/hydra/evaluate.scm
index afc7730ff24..ab10253f31f 100644
--- a/build-aux/hydra/evaluate.scm
+++ b/build-aux/hydra/evaluate.scm
@@ -49,6 +49,17 @@ (define (call-with-time-display thunk)
(/ (time-nanosecond time) 1e9)))
(apply values results))))
+(define (assert-valid-job job thing)
+ "Raise an error if THING is not an alist with a valid 'derivation' entry.
+Otherwise return THING."
+ (unless (and (list? thing)
+ (and=> (assoc-ref thing 'derivation)
+ (lambda (value)
+ (and (string? value)
+ (string-suffix? ".drv" value)))))
+ (error "job did not produce a valid alist" job thing))
+ thing)
+
;; Without further ado...
(match (command-line)
@@ -83,7 +94,9 @@ (define (call-with-time-display thunk)
(map (lambda (job thunk)
(format (current-error-port) "evaluating '~a'... " job)
(force-output (current-error-port))
- (cons job (call-with-time-display thunk)))
+ (cons job
+ (assert-valid-job job
+ (call-with-time-display thunk))))
names thunks)))
port))))
((command _ ...)
--
GitLab