From patchwork Thu Dec 20 21:05:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 505 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CD639169AD; Thu, 20 Dec 2018 21:07:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTP id 3DFD0169AB for ; Thu, 20 Dec 2018 21:07:11 +0000 (GMT) Received: from localhost ([::1]:39872 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ga5XC-0001Uv-41 for patchwork@mira.cbaines.net; Thu, 20 Dec 2018 16:07:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ga5X9-0001Ue-7B for guix-patches@gnu.org; Thu, 20 Dec 2018 16:07:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ga5X6-0005zo-3e for guix-patches@gnu.org; Thu, 20 Dec 2018 16:07:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:52550) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ga5X5-0005zj-V8 for guix-patches@gnu.org; Thu, 20 Dec 2018 16:07:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ga5X5-0002WG-OK for guix-patches@gnu.org; Thu, 20 Dec 2018 16:07:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33815] [PATCH] gnu: mit-scheme: Enable tests. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Dec 2018 21:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33815 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33815@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15453399709585 (code B ref -1); Thu, 20 Dec 2018 21:07:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 Dec 2018 21:06:10 +0000 Received: from localhost ([127.0.0.1]:56802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ga5WD-0002UX-NW for submit@debbugs.gnu.org; Thu, 20 Dec 2018 16:06:09 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ga5WB-0002To-BE for submit@debbugs.gnu.org; Thu, 20 Dec 2018 16:06:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ga5W5-0004T4-GP for submit@debbugs.gnu.org; Thu, 20 Dec 2018 16:06:02 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:47830) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ga5W5-0004Sf-BS for submit@debbugs.gnu.org; Thu, 20 Dec 2018 16:06:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42734) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ga5W4-0001NP-Jm for guix-patches@gnu.org; Thu, 20 Dec 2018 16:06:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ga5W1-0004Hz-Ck for guix-patches@gnu.org; Thu, 20 Dec 2018 16:06:00 -0500 Received: from mout02.posteo.de ([185.67.36.66]:42267) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ga5W0-0004CK-0I for guix-patches@gnu.org; Thu, 20 Dec 2018 16:05:56 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 2E4362400FD for ; Thu, 20 Dec 2018 22:05:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1545339954; bh=sRg74iKx50wkMZX2fAqP/ssEM1h0eGdsKmzlLC2kdiA=; h=From:To:Cc:Subject:Date:From; b=Oy48QVlsuUcfRuqS539uanouBuLu0Wz0qQAymStRAcogcC6tzXgshMcEZqawnxhN7 pbHPQNPXR0HdUlcZ6esXHQxu+IWCFaJUyjvXG1EnWtGf5AciY8AtPIkYPoRjR8XI+E GSaY2GHLvAQf0X8FVzEPmMlRygSvAbblMGaLzPObTGotsyLHYpSYPRxpvSKJry4HaQ xYFosafj+2TwmYJVvASkasYShlRZKdHpXaXEEH6yRHpqxSObzrdSqsOeLfCWx/HAIK LjHddr5rUuyOazroBAOYuO9skZ1QCG6VL4DYo75Ix8i8Nu+eHVcUU9RunOtxavEAz7 WZGa6msEGPCtw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 43LPS12C3Xz9rxM; Thu, 20 Dec 2018 22:05:53 +0100 (CET) From: Kei Kebreau Date: Thu, 20 Dec 2018 16:05:50 -0500 Message-Id: <20181220210550.17484-1-kkebreau@posteo.net> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kei Kebreau Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/scheme.scm (mit-scheme)[arguments]: Remove #:tests?. Add 'patch-/bin/sh' phase. [native-inputs]: Add autoconf, automake, and libtool. --- gnu/packages/scheme.scm | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 3c688e120..16904dce3 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -37,6 +37,7 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) + #:use-module (gnu packages autotools) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages compression) #:use-module (gnu packages libevent) @@ -85,8 +86,7 @@ (outputs '("out" "doc")) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no "check" target - #:modules ((guix build gnu-build-system) + `(#:modules ((guix build gnu-build-system) (guix build utils) (srfi srfi-1)) #:phases @@ -103,6 +103,20 @@ (find-files "src/compiler" "^make\\.")) (chdir "src") #t)) + (add-after 'unpack 'patch-/bin/sh + (lambda _ + (setenv "CONFIG_SHELL" (which "sh")) + (substitute* '("../tests/ffi/autogen.sh" + "../tests/ffi/autobuild.sh" + "../tests/ffi/test-ffi.sh" + "../tests/runtime/test-process.scm" + "runtime/unxprm.scm") + (("/bin/sh") (which "sh")) + (("\\./autogen\\.sh") + (string-append (which "sh") " autogen.sh")) + (("\\./configure") + (string-append (which "sh") " configure"))) + #t)) ;; FIXME: the texlive-union insists on regenerating fonts. It stores ;; them in HOME, so it needs to be writeable. (add-before 'build 'set-HOME @@ -150,7 +164,11 @@ (delete-file-recursively old-doc-dir) #t)))))) (native-inputs - `(("texlive" ,(texlive-union (list texlive-tex-texinfo))) + `(;; Autoconf, Automake, and Libtool are necessary for the FFI tests. + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("texlive" ,(texlive-union (list texlive-tex-texinfo))) ("texinfo" ,texinfo) ("m4" ,m4))) (inputs