Remove redundancies in the specification examples.

pull/3/head
Mathieu Lirzin 2016-07-13 18:59:30 +02:00
parent 3efe57e0ca
commit 1a542e4d1b
2 changed files with 36 additions and 37 deletions

View File

@ -1,5 +1,4 @@
;;;; guix-jobs.scm - job specification test for Guix. ;;; guix-jobs.scm -- job specification test for Guix
;;;
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; ;;;
;;; This file is part of Cuirass. ;;; This file is part of Cuirass.
@ -22,15 +21,17 @@
;; However for testing purpose use local gnu-system.scm instead. ;; However for testing purpose use local gnu-system.scm instead.
(string-append (dirname (current-filename)) "/" file)) (string-append (dirname (current-filename)) "/" file))
`(((#:name . "guix") (define job-base
(#:url . "git://git.savannah.gnu.org/guix.git") `((#:name . "guix")
(#:load-path . ".") (#:url . "git://git.savannah.gnu.org/guix.git")
(#:branch . "master") (#:load-path . ".")
(#:file . ,(local-file "gnu-system.scm")) (#:file . ,(local-file "gnu-system.scm"))
(#:proc . hydra-jobs)) (#:proc . hydra-jobs)))
((#:name . "guix")
(#:url . "git://git.savannah.gnu.org/guix.git") (define guix-master
(#:load-path . ".") (acons #:branch "master" job-base))
(#:tag . "v0.10.0")
(#:file . ,(local-file "gnu-system.scm")) (define guix-0.10
(#:proc . hydra-jobs))) (acons #:tag "v0.10.0" job-base))
(list guix-master guix-0.10)

View File

@ -1,5 +1,4 @@
;;;; hello-subset.scm - job specification test for hello subset. ;;; hello-subset.scm -- job specification test for hello subset
;;;
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; ;;;
;;; This file is part of Cuirass. ;;; This file is part of Cuirass.
@ -22,24 +21,23 @@
;; However for testing purpose use local gnu-system.scm instead. ;; However for testing purpose use local gnu-system.scm instead.
(string-append (dirname (current-filename)) "/" file)) (string-append (dirname (current-filename)) "/" file))
`(((#:name . "guix") (define job-base
(#:url . "git://git.savannah.gnu.org/guix.git") `((#:name . "guix")
(#:load-path . ".") (#:url . "git://git.savannah.gnu.org/guix.git")
(#:branch . "master") (#:load-path . ".")
(#:file . ,(local-file "gnu-system.scm")) (#:file . ,(local-file "gnu-system.scm"))
(#:proc . hydra-jobs) (#:proc . hydra-jobs)
(#:arguments (subset . "hello"))) (#:arguments (subset . "hello"))))
((#:name . "guix")
(#:url . "git://git.savannah.gnu.org/guix.git") (define guix-master
(#:load-path . ".") (acons #:branch "master" job-base))
(#:branch . "core-updates")
(#:file . ,(local-file "gnu-system.scm")) (define guix-core-updates
(#:proc . hydra-jobs) (acons #:branch "core-updates" job-base))
(#:arguments (subset . "hello")))
((#:name . "guix") (define guix-0.10
(#:url . "git://git.savannah.gnu.org/guix.git") (acons #:tag "v0.10.0" job-base))
(#:load-path . ".")
(#:tag . "v0.9.0") (list guix-master
(#:file . ,(local-file "gnu-system.scm")) guix-core-updates
(#:proc . hydra-jobs) guix-0.10)
(#:arguments (subset . "hello"))))