futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: guile: Fix tests on emulated architectures.

Browse Source 
The stack overflow test limits the virtual memory size using setrlimit with
RLIMIT_AS argument. This is ignored when using QEMU transparent emulation,
causing the test to crash.

* gnu/packages/patches/guile-2.2-skip-so-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/guile.scm (guile-3.0-latest): Add it.
This commit is contained in:
Mathieu Othacehe 2021-01-11 11:29:00 +01:00
parent b54b3f5419
commit 21cf0d36db
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
3 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/local.mk
View File

@ -1126,6 +1126,7 @@ dist_patch_DATA = \
%D%/packages/patches/gspell-dash-test.patch \
%D%/packages/patches/guile-1.8-cpp-4.5.patch \
%D%/packages/patches/guile-2.2-skip-oom-test.patch \
%D%/packages/patches/guile-2.2-skip-so-test.patch \
%D%/packages/patches/guile-default-utf8.patch \
%D%/packages/patches/guile-2.2-default-utf8.patch \
%D%/packages/patches/guile-relocatable.patch \

23
gnu/packages/guile.scm
View File

@ -310,16 +310,19 @@ without requiring the source code to be rewritten.")
(define-public guile-3.0-latest
;; TODO: Make this 'guile-3.0' on the next rebuild cycle.
(package
(inherit guile-3.0)
(version "3.0.5")
(source (origin
(inherit (package-source guile-3.0))
(uri (string-append "mirror://gnu/guile/guile-"
version ".tar.xz"))
(sha256
(base32
"1wah6fq1h8vmbpdadjych1mq8hyqkd7p015cbxm14ri37l1gnxid"))))))
(package-with-extra-patches
(package
(inherit guile-3.0)
(version "3.0.5")
(source (origin
(inherit (package-source guile-3.0))
(uri (string-append "mirror://gnu/guile/guile-"
version ".tar.xz"))
(sha256
(base32
"1wah6fq1h8vmbpdadjych1mq8hyqkd7p015cbxm14ri37l1gnxid")))))
;; Remove on the next rebuild cycle.
(search-patches "guile-2.2-skip-so-test.patch")))
(define-public guile-next
(deprecated-package "guile-next" guile-3.0))

23
gnu/packages/patches/guile-2.2-skip-so-test.patch Normal file
View File

@ -0,0 +1,23 @@
Skip 'test-stack-overflow' that crashes when using QEMU transparent emulation.
--- a/test-suite/standalone/Makefile.in 1970-01-01 01:00:01.000000000 +0100
+++ b/test-suite/standalone/Makefile.in 2021-01-11 10:59:31.606269449 +0100
@@ -102,8 +102,7 @@
test-scm-to-latin1-string$(EXEEXT) test-scm-values$(EXEEXT) \
test-scm-c-bind-keyword-arguments$(EXEEXT) \
test-srfi-4$(EXEEXT) $(am__append_6) $(am__EXEEXT_1) \
- test-smob-mark$(EXEEXT) test-smob-mark-race$(EXEEXT) \
- test-stack-overflow
+ test-smob-mark$(EXEEXT) test-smob-mark-race$(EXEEXT)
check_PROGRAMS = test-num2integral$(EXEEXT) test-round$(EXEEXT) \
test-foreign-object-c$(EXEEXT) test-list$(EXEEXT) \
test-unwind$(EXEEXT) test-conversion$(EXEEXT) \
@@ -1938,7 +1937,7 @@
test-command-line-encoding test-command-line-encoding2 \
test-language test-guild-compile $(am__append_3) \
test-foreign-object-scm test-fast-slot-ref test-mb-regexp \
- test-use-srfi $(am__append_5) test-stack-overflow
+ test-use-srfi $(am__append_5)
BUILT_SOURCES = $(am__append_2)
EXTRA_DIST = test-import-order-a.scm test-import-order-b.scm \
test-import-order-c.scm test-import-order-d.scm \