summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2014-11-07 23:18:56 +0100
committerAndreas Enge <andreas@enge.fr>2014-11-18 23:10:17 +0100
commit3f2a772789bacb4c1c5cdbddb1699ba8152a9cc8 (patch)
tree11d2abe9461cfb23c38a8732adf99982ab176e81
parentaa3d9011262a9d4a5edd1884029cd99ab5e26649 (diff)
downloadguix-3f2a772789bacb4c1c5cdbddb1699ba8152a9cc8.tar.gz
gnu: acl: Towards tests; enable infrastructure, but keep tests disabled
  since they fail.

* gnu/packages/acl.scm (acl): Correct test target, add inputs perl and sed,
    replace "/bin/sh" in perl test script.
-rw-r--r--gnu/packages/acl.scm21
1 files changed, 15 insertions, 6 deletions
diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm
index ee101dae7b..af2fb62b8a 100644
--- a/gnu/packages/acl.scm
+++ b/gnu/packages/acl.scm
@@ -21,8 +21,9 @@
 (define-module (gnu packages acl)
   #:use-module (guix licenses)
   #:use-module (gnu packages attr)
-  #:use-module (gnu packages perl)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages gettext)
+  #:use-module (gnu packages perl)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
@@ -42,15 +43,23 @@
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f   ; FIXME: Investigate test suite failures
+       #:test-target "tests"
        #:phases
-        (alist-replace
-         'install
+        (alist-cons-after
+         'build 'patch-exec-bin-sh
          (lambda _
-           (zero? (system* "make" "install" "install-lib" "install-dev")))
-         %standard-phases)))
+           (substitute* "test/run"
+             (("/bin/sh") (which "sh"))))
+         (alist-replace
+          'install
+          (lambda _
+            (zero? (system* "make" "install" "install-lib" "install-dev")))
+          %standard-phases))))
     (inputs `(("attr" ,attr)))
     (native-inputs
-     `(("gettext" ,gnu-gettext)))
+     `(("gettext" ,gnu-gettext)
+       ("perl" ,perl)
+       ("sed" ,sed)))
 
     (home-page
      "http://savannah.nongnu.org/projects/acl")