[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Ludovic Courtès |
Date: |
Fri, 6 Apr 2018 17:11:14 -0400 (EDT) |
branch: master
commit 38d367d71c1513a905d8e6006134bafe68b7e580
Author: Ludovic Courtès <address@hidden>
Date: Fri Apr 6 10:39:23 2018 +0200
evaluate: Really pass arguments like Hydra.
* bin/evaluate.in (main): Use SPEC's #:name as a key in ARGS.
* examples/random-jobs.scm (make-random-jobs): Adjust accordingly.
---
bin/evaluate.in | 8 +++++---
examples/random-jobs.scm | 10 ++++++----
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/bin/evaluate.in b/bin/evaluate.in
index c8d83e6..6a2678e 100644
--- a/bin/evaluate.in
+++ b/bin/evaluate.in
@@ -70,11 +70,13 @@ exec ${GUILE:address@hidden@} --no-auto-compile -e main -s
"$0" "$@"
(let* ((proc-name (assq-ref spec #:proc))
(proc (module-ref %user-module proc-name))
(commit (assq-ref spec #:current-commit))
- (args `((revision . ,commit)
- (file-name . ,source)
+ (name (assq-ref spec #:name))
+ (args `((,(string->symbol name)
+ (revision . ,commit)
+ (file-name . ,source))
,@(or (assq-ref spec #:arguments) '())))
(thunks (proc store args))
- (eval `((#:specification . ,(assq-ref spec #:name))
+ (eval `((#:specification . ,name)
(#:revision . ,commit))))
(pretty-print
`(evaluation ,eval
diff --git a/examples/random-jobs.scm b/examples/random-jobs.scm
index 97ca150..78a09f4 100644
--- a/examples/random-jobs.scm
+++ b/examples/random-jobs.scm
@@ -42,10 +42,12 @@
(mkdir #$output))))))
(define (make-random-jobs store arguments)
- (format (current-error-port)
- "evaluating random jobs from directory ~s, commit ~s~%"
- (assq-ref arguments 'file-name)
- (assq-ref arguments 'revision))
+ (let ((random (assq-ref arguments 'random)))
+ (format (current-error-port)
+ "evaluating random jobs from directory ~s, commit ~s~%"
+ (assq-ref random 'file-name)
+ (assq-ref random 'revision)))
+
(unfold (cut > <> 10)
(lambda (i)
(let ((suffix (number->string i)))