Remove redundancies in the specification examples.

2 files changed, 36 insertions, 37 deletions

diff --git a/tests/guix-jobs.scm b/tests/guix-jobs.scm
index 470305f..862cff7 100644
--- a/tests/guix-jobs.scm
+++ b/tests/guix-jobs.scm
@@ -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>
 ;;;
 ;;; This file is part of Cuirass.
@@ -22,15 +21,17 @@
   ;; However for testing purpose use local gnu-system.scm instead.
   (string-append (dirname (current-filename)) "/" file))
 
-`(((#:name . "guix")
-   (#:url . "git://git.savannah.gnu.org/guix.git")
-   (#:load-path . ".")
-   (#:branch . "master")
-   (#:file . ,(local-file "gnu-system.scm"))
-   (#:proc . hydra-jobs))
-  ((#:name . "guix")
-   (#:url . "git://git.savannah.gnu.org/guix.git")
-   (#:load-path . ".")
-   (#:tag . "v0.10.0")
-   (#:file . ,(local-file "gnu-system.scm"))
-   (#:proc . hydra-jobs)))
+(define job-base
+  `((#:name . "guix")
+    (#:url . "git://git.savannah.gnu.org/guix.git")
+    (#:load-path . ".")
+    (#:file . ,(local-file "gnu-system.scm"))
+    (#:proc . hydra-jobs)))
+
+(define guix-master
+  (acons #:branch "master" job-base))
+
+(define guix-0.10
+  (acons #:tag "v0.10.0" job-base))
+
+(list guix-master guix-0.10)
diff --git a/tests/hello-subset.scm b/tests/hello-subset.scm
index 76136ef..60764fc 100644
--- a/tests/hello-subset.scm
+++ b/tests/hello-subset.scm
@@ -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>
 ;;;
 ;;; This file is part of Cuirass.
@@ -22,24 +21,23 @@
   ;; However for testing purpose use local gnu-system.scm instead.
   (string-append (dirname (current-filename)) "/" file))
 
-`(((#:name . "guix")
-   (#:url . "git://git.savannah.gnu.org/guix.git")
-   (#:load-path . ".")
-   (#:branch . "master")
-   (#:file . ,(local-file "gnu-system.scm"))
-   (#:proc . hydra-jobs)
-   (#:arguments (subset . "hello")))
-  ((#:name . "guix")
-   (#:url . "git://git.savannah.gnu.org/guix.git")
-   (#:load-path . ".")
-   (#:branch . "core-updates")
-   (#:file . ,(local-file "gnu-system.scm"))
-   (#:proc . hydra-jobs)
-   (#:arguments (subset . "hello")))
-  ((#:name . "guix")
-   (#:url . "git://git.savannah.gnu.org/guix.git")
-   (#:load-path . ".")
-   (#:tag . "v0.9.0")
-   (#:file . ,(local-file "gnu-system.scm"))
-   (#:proc . hydra-jobs)
-   (#:arguments (subset . "hello"))))
+(define job-base
+  `((#:name . "guix")
+    (#:url . "git://git.savannah.gnu.org/guix.git")
+    (#:load-path . ".")
+    (#:file . ,(local-file "gnu-system.scm"))
+    (#:proc . hydra-jobs)
+    (#:arguments (subset . "hello"))))
+
+(define guix-master
+  (acons #:branch "master" job-base))
+
+(define guix-core-updates
+  (acons #:branch "core-updates" job-base))
+
+(define guix-0.10
+  (acons #:tag "v0.10.0" job-base))
+
+(list guix-master
+      guix-core-updates
+      guix-0.10)