GNU bug report logs - #33815
[PATCH] gnu: mit-scheme: Enable tests.

Previous Next

Package: guix-patches;

Reported by: Kei Kebreau <kkebreau <at> posteo.net>

Date: Thu, 20 Dec 2018 21:07:02 UTC

Severity: normal

Tags: patch

Done: Kei Kebreau <kkebreau <at> posteo.net>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Kei Kebreau <kkebreau <at> posteo.net>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#33815: closed ([PATCH] gnu: mit-scheme: Enable tests.)
Date: Wed, 26 Dec 2018 22:50:02 +0000
[Message part 1 (text/plain, inline)]
Your message dated Wed, 26 Dec 2018 17:49:18 -0500
with message-id <87o997gaz5.fsf <at> posteo.net>
and subject line Re: [bug#33815] [PATCH] gnu: mit-scheme: Enable tests.
has caused the debbugs.gnu.org bug report #33815,
regarding [PATCH] gnu: mit-scheme: Enable tests.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
33815: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=33815
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: Kei Kebreau <kkebreau <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: Kei Kebreau <kkebreau <at> posteo.net>
Subject: [PATCH] gnu: mit-scheme: Enable tests.
Date: Thu, 20 Dec 2018 16:05:50 -0500
* 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
-- 
2.20.0



[Message part 3 (message/rfc822, inline)]
From: Kei Kebreau <kkebreau <at> posteo.net>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 33815-done <at> debbugs.gnu.org
Subject: Re: [bug#33815] [PATCH] gnu: mit-scheme: Enable tests.
Date: Wed, 26 Dec 2018 17:49:18 -0500
Ludovic Courtès <ludo <at> gnu.org> writes:

> Hello Kei,
>
> Kei Kebreau <kkebreau <at> posteo.net> skribis:
>
>> * gnu/packages/scheme.scm (mit-scheme)[arguments]: Remove #:tests?.  Add
>> 'patch-/bin/sh' phase.
>> [native-inputs]: Add autoconf, automake, and libtool.
>
> Nice, LGTM!
>
> Ludo’.

Pushed to master! Thanks for reviewing.


This bug report was last modified 6 years and 147 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.