ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-19 09:22:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: redis: Unbundle jemalloc & reinstate most of the tests

Browse source 
* gnu/packages/databases.scm (redis)[source]: Delete bundled jemalloc.
[native-inputs]: Add procps & tcl for the tests. [arguments]: substitute
the right tclsh binary & disable failing tests.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
Vincent Legoll 2020-12-28 19:45:25 +01:00 committed by Efraim Flashner
parent a7051a0e93
commit 3a1cb921c9
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gnu/packages/databases.scm
View file

@ -2137,12 +2137,36 @@ (define-public redis
version".tar.gz"))
(sha256
(base32
"1pc6gyiylrcazlc559dp5mxqj733pk9qabnirw4ry3k23kwdqayw"))))
"1pc6gyiylrcazlc559dp5mxqj733pk9qabnirw4ry3k23kwdqayw"))
(modules '((guix build utils)))
(snippet
;; Delete bundled jemalloc, as the package will use the libc one
'(begin (delete-file-recursively "deps/jemalloc")
#t))))
(build-system gnu-build-system)
(native-inputs
`(("procps" ,procps) ; for tests
("tcl" ,tcl))) ; for tests
(arguments
'(#:tests? #f ; tests related to master/slave and replication fail
#:phases (modify-phases %standard-phases
(delete 'configure))
'(#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'use-correct-tclsh
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "runtest"
(("^TCLSH=.*")
(string-append "TCLSH="
(assoc-ref inputs "tcl")
"/bin/tclsh")))
#t))
(add-after 'unpack 'adjust-tests
(lambda _
;; Disable failing tests
(substitute* "tests/test_helper.tcl"
((" integration/replication[^-]") "")
((" integration/replication-4") "")
((" integration/replication-psync") ""))
#t)))
#:make-flags `("CC=gcc"
"MALLOC=libc"
"LDFLAGS=-ldl"