summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2018-01-13 17:54:57 -0500
committerLudovic Courtès <ludo@gnu.org>2018-02-05 16:54:27 +0100
commit58b6812fd4c480bc3ef07934c5967d18a2992292 (patch)
tree80a17a44e6b44266bb5ee9225a51b876d950151c
parentb7dee6a0b8af90e5adaa5b35f8dda359de96868d (diff)
downloadguix-58b6812fd4c480bc3ef07934c5967d18a2992292.tar.gz
emacs-build-system: Reinstate the check phase.
* guix/build/emacs-build-system.scm (%standard-phases): Reinstate the check
phase from the gnu-build-system.
* guix/build-system/emacs.scm (emacs-build)[tests?]: But do not enable it by default.
[parallel-tests?]: Add argument.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--guix/build-system/emacs.scm3
-rw-r--r--guix/build/emacs-build-system.scm1
2 files changed, 2 insertions, 2 deletions
diff --git a/guix/build-system/emacs.scm b/guix/build-system/emacs.scm
index 02296829c6..d9f1a8d289 100644
--- a/guix/build-system/emacs.scm
+++ b/guix/build-system/emacs.scm
@@ -82,7 +82,8 @@
 
 (define* (emacs-build store name inputs
                       #:key source
-                      (tests? #t)
+                      (tests? #f)
+                      (parallel-tests? #t)
                       (test-target "test")
                       (configure-flags ''())
                       (phases '(@ (guix build emacs-build-system)
diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm
index bdef4d25d7..a68ca60c7e 100644
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@ -246,7 +246,6 @@ second hyphen.  This corresponds to 'name-version' as used in ELPA packages."
     (add-after 'set-paths 'set-emacs-load-path set-emacs-load-path)
     (replace 'unpack unpack)
     (delete 'configure)
-    (delete 'check)
     ;; Move the build phase after install: the .el files are byte compiled
     ;; directly in the store.
     (delete 'build)