tests: Factorize the 'dummy-package' macro.

* guix/tests.scm (dummy-package): New macro.
* tests/lint.scm (dummy-package): Remove.
* tests/packages.scm (dummy-package): Remove.

diff --git a/guix/tests.scm b/guix/tests.scm
index 0226799..82ae7e2 100644 (file)
--- a/guix/tests.scm
+++ b/guix/tests.scm
@@ -27,7 +27,8 @@
   #:export (open-connection-for-tests
             random-text
             random-bytevector
-            with-derivation-narinfo))
+            with-derivation-narinfo
+            dummy-package))
 
 ;;; Commentary:
 ;;;
@@ -120,6 +121,15 @@ substituter's viewpoint."
     (lambda ()
       body ...)))
 
+(define-syntax-rule (dummy-package name* extra-fields ...)
+  "Return a \"dummy\" package called NAME*, with all its compulsory fields
+initialized with default values, and with EXTRA-FIELDS set as specified."
+  (package extra-fields ...
+           (name name*) (version "0") (source #f)
+           (build-system gnu-build-system)
+           (synopsis #f) (description #f)
+           (home-page #f) (license #f)))
+
 ;; Local Variables:
 ;; eval: (put 'call-with-derivation-narinfo 'scheme-indent-function 1)
 ;; End:

diff --git a/tests/lint.scm b/tests/lint.scm
index 8ae129d..e7e548b 100644 (file)
--- a/tests/lint.scm
+++ b/tests/lint.scm
@@ -19,6 +19,7 @@
 
 
 (define-module (test-packages)
+  #:use-module (guix tests)
   #:use-module (guix build download)
   #:use-module (guix build-system gnu)
   #:use-module (guix packages)
@@ -105,12 +106,6 @@ requests."
 \f
 (test-begin "lint")
 
-(define-syntax-rule (dummy-package name* extra-fields ...)
-  (package extra-fields ... (name name*) (version "0") (source #f)
-           (build-system gnu-build-system)
-           (synopsis #f) (description #f)
-           (home-page #f) (license #f) ))
-
 (define (call-with-warnings thunk)
   (let ((port (open-output-string)))
     (parameterize ((guix-warning-port port))

diff --git a/tests/packages.scm b/tests/packages.scm
index 98fa9b5..f7d6155 100644 (file)
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -48,13 +48,6 @@
 (define %store
   (open-connection-for-tests))
 
-(define-syntax-rule (dummy-package name* extra-fields ...)
-  (package (name name*) (version "0") (source #f)
-           (build-system gnu-build-system)
-           (synopsis #f) (description #f)
-           (home-page #f) (license #f)
-           extra-fields ...))
-
 \f
 (test-begin "packages")