aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorVincent Legoll <vincent.legoll@gmail.com>2020-12-28 19:45:25 +0100
committerEfraim Flashner <efraim@flashner.co.il>2020-12-29 10:51:48 +0200
commit3a1cb921c9209d77ae1af38ef5bfa1620fd99899 (patch)
treee7a83909fdd86a73575b647b10356fc34facd0f6 /gnu
parenta7051a0e93cd6b733a0f936bd928d11422a66448 (diff)
downloadguix-3a1cb921c9209d77ae1af38ef5bfa1620fd99899.tar
guix-3a1cb921c9209d77ae1af38ef5bfa1620fd99899.tar.gz
gnu: redis: Unbundle jemalloc & reinstate most of the tests
* 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>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/databases.scm32
1 files changed, 28 insertions, 4 deletions
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 919ec160e7..6c1bb7b34d 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -2137,12 +2137,36 @@ similar to BerkeleyDB, LevelDB, etc.")
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"