all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Vincent Legoll <vincent.legoll@gmail.com>
To: 45470@debbugs.gnu.org
Cc: Vincent Legoll <vincent.legoll@gmail.com>
Subject: [bug#45470] [PATCH 2/2] gnu: redis: Unbundle jemalloc & reinstate most of the tests
Date: Mon, 28 Dec 2020 19:45:25 +0100	[thread overview]
Message-ID: <20201228184525.21537-2-vincent.legoll@gmail.com> (raw)
In-Reply-To: <20201228184525.21537-1-vincent.legoll@gmail.com>

* 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.
---
 gnu/packages/databases.scm | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 919ec160e7..a58b4189f8 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -2137,12 +2137,30 @@ 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 'tclsh
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      (substitute* "runtest"
+                        (("^TCLSH=.*")
+                          (string-append "TCLSH="
+                            (assoc-ref inputs "tcl") "/bin/tclsh")))
+                      ; 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"
-- 
2.29.2





  reply	other threads:[~2020-12-28 18:46 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-27 16:49 [bug#45470] [PATCH] gnu: redis: Update to 6.0.9 Vincent Legoll
2020-12-28 15:44 ` Efraim Flashner
2020-12-28 15:47   ` Vincent Legoll
2020-12-28 18:45     ` Vincent Legoll
2020-12-28 18:45 ` [bug#45470] [PATCH 1/2] " Vincent Legoll
2020-12-28 18:45   ` Vincent Legoll [this message]
2020-12-29  8:56     ` bug#45470: [PATCH 2/2] gnu: redis: Unbundle jemalloc & reinstate most of the tests Efraim Flashner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201228184525.21537-2-vincent.legoll@gmail.com \
    --to=vincent.legoll@gmail.com \
    --cc=45470@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.