From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dOpSc-0006NO-VB for guix-patches@gnu.org; Sat, 24 Jun 2017 14:07:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dOpSY-0003Rb-0U for guix-patches@gnu.org; Sat, 24 Jun 2017 14:07:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:33229) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dOpSX-0003Qr-Td for guix-patches@gnu.org; Sat, 24 Jun 2017 14:07:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dOpSX-0006nZ-Nv for guix-patches@gnu.org; Sat, 24 Jun 2017 14:07:01 -0400 Subject: [bug#27477] [PATCH] gnu: acl: Enable tests. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44971) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dOpS1-0006Lf-IX for guix-patches@gnu.org; Sat, 24 Jun 2017 14:06:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dOpRw-0002xz-PZ for guix-patches@gnu.org; Sat, 24 Jun 2017 14:06:29 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:46026 helo=mail.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dOpRw-0002w1-Gq for guix-patches@gnu.org; Sat, 24 Jun 2017 14:06:24 -0400 From: Kei Kebreau Date: Sat, 24 Jun 2017 14:06:06 -0400 Message-Id: <20170624180606.1230-1-kei@openmailbox.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 27477@debbugs.gnu.org Cc: Kei Kebreau * gnu/packages/acl.scm (acl)[arguments]: Enable tests. Add 'patch-tests' phase. --- gnu/packages/acl.scm | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm index ae6764993..34f8c294a 100644 --- a/gnu/packages/acl.scm +++ b/gnu/packages/acl.scm @@ -44,19 +44,30 @@ (patches (search-patches "acl-hurd-path-max.patch")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; FIXME: Investigate test suite failures - #:test-target "tests" + `(#:test-target "tests" #:phases (alist-cons-after 'build 'patch-exec-bin-sh (lambda _ (substitute* "test/run" (("/bin/sh") (which "sh")))) - (alist-replace - 'install + (alist-cons-before + 'check 'patch-tests (lambda _ - (zero? (system* "make" "install" "install-lib" "install-dev"))) - %standard-phases)))) + ;; The coreutils do not have an ACL bit to remove from their + ;; output, so the sed expression that removes the bit is disabled. + (substitute* "test/sbits-restore.test" + (("\\| sed.*'") "")) + ;; These tests require the existence of a user named "bin", but + ;; this user does not exist within Guix's build environment. + (for-each (lambda (file) + (delete-file (string-append "test/" file))) + '("setfacl-X.test" "cp.test" "misc.test"))) + (alist-replace + 'install + (lambda _ + (zero? (system* "make" "install" "install-lib" "install-dev"))) + %standard-phases))))) (inputs `(("attr" ,attr))) (native-inputs `(("gettext" ,gettext-minimal) -- 2.13.1