01/01: gnu: emacs-deferred: Fix tests.

[Arun Isaac]

arunisaac pushed a commit to branch master
in repository guix.

commit 90ec79fb2933a4d33ab3861d72e1b4382c8d39f2
Author: Arun Isaac <address@hidden>
Date:   Thu May 3 22:15:01 2018 +0530

    gnu: emacs-deferred: Fix tests.
    
    * gnu/packages/emacs.scm (emacs-deferred)[arguments]: Add set-shell phase.
    Set #:test-command to "make test".
---
 gnu/packages/emacs.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 3eec8fb..186b87f 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -2567,17 +2567,19 @@ framework for Emacs Lisp to be used with @code{ert}.")
     (arguments
      `(#:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'set-shell
+           ;; Setting the SHELL environment variable is required for the tests
+           ;; to find sh.
+           (lambda _
+             (setenv "SHELL" (which "sh"))
+             #t))
          (add-before 'check 'fix-makefile
            (lambda _
              (substitute* "Makefile"
                (("\\$\\(CASK\\) exec ") ""))
              #t)))
        #:tests? #t
-       ;; FIXME: Normally we'd run the "test" target but for some reason the
-       ;; test-deferred target fails when run in the Guix build environment
-       ;; with the error: (file-error "Searching for program" "No such file or
-       ;; directory" "/bin/sh").
-       #:test-command '("make" "test-concurrent" "test-concurrent-compiled")))
+       #:test-command '("make" "test")))
     (native-inputs
      `(("emacs-ert-expectations" ,emacs-ert-expectations)
        ("emacs-undercover" ,emacs-undercover)