From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id WDGdAQgo6l+IIAAA0tVLHw (envelope-from ) for ; Mon, 28 Dec 2020 18:46:32 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id OBsUOQco6l9FIAAA1q6Kng (envelope-from ) for ; Mon, 28 Dec 2020 18:46:31 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 505979402A9 for ; Mon, 28 Dec 2020 18:46:31 +0000 (UTC) Received: from localhost ([::1]:59636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktxXK-0005gZ-83 for larch@yhetil.org; Mon, 28 Dec 2020 13:46:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktxWs-0005fC-Ty for guix-patches@gnu.org; Mon, 28 Dec 2020 13:46:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53590) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktxWs-0007qf-MD for guix-patches@gnu.org; Mon, 28 Dec 2020 13:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktxWs-000135-K8 for guix-patches@gnu.org; Mon, 28 Dec 2020 13:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45470] [PATCH 2/2] gnu: redis: Unbundle jemalloc & reinstate most of the tests Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 18:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45470 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45470@debbugs.gnu.org Received: via spool by 45470-submit@debbugs.gnu.org id=B45470.16091811483990 (code B ref 45470); Mon, 28 Dec 2020 18:46:02 +0000 Received: (at 45470) by debbugs.gnu.org; 28 Dec 2020 18:45:48 +0000 Received: from localhost ([127.0.0.1]:36901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktxWd-00012I-QL for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:45:48 -0500 Received: from mail-wr1-f49.google.com ([209.85.221.49]:37639) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktxWY-00011r-4v for 45470@debbugs.gnu.org; Mon, 28 Dec 2020 13:45:43 -0500 Received: by mail-wr1-f49.google.com with SMTP id i9so12214868wrc.4 for <45470@debbugs.gnu.org>; Mon, 28 Dec 2020 10:45:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gne9dPtJ7vraC94RZoxnboDMqF2LESHWOLNXLX9dp/Y=; b=o2ArgPeh7zmwXAyHXF4HR5z7U04z8wSTrZ0WFz/7wMIK5ru/WTLOUWKRLO4j6kyYHr 3AQ+ujPLh3vwxJpXgHWmUZ9tz3loOGb8q7rYPgGT5OHrrez1edj5KaG+O0UimCrYYnSg xeJj2WkmyC0lkM2eJ9oFManI4fcQjM8Gr8J85zUuw7ANihagE2aLS4HZ7EUkKfo89k9r 0nujkJlC3lDcj40HlW0VDATiXc020QQRrc8KGW9jrtJE8dPWkZWzdmR4KvO7dahQJrg8 qMijYw6I9YbcCEGycoqS0wu+otA0+tz/SYD7R2XiLlA/eX9SYtUYDQLJ3aisbEGbiEPM ffAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gne9dPtJ7vraC94RZoxnboDMqF2LESHWOLNXLX9dp/Y=; b=MuYEQdwqphKbLsIH8iEoTqSjHeuQOXoSyRbtPWpS1kQYx7qVGNBTRNZsodtQXdSTRY Xa4YTVutI5OFSBPekQqZEVuT8o+7Hff4BnMXV7L6LkYGpAy18RjBpggqjiJPFw4IPkTS zcYSgeyT17J+NtznV6OZ8sAk9gQpZCCN7DapMpIHO2v5tf4jZ6xeCioUJFcoUeJJYuGa 7Py32McpU1LbVReH/ILmhnjsZ2dCT3qu6rHV5K1dGHHuq7vT8K11JtVzN33CHQd95DId Pa132izHk8jroV0oco6bOH7Rcm5tzsj570GtSJDe0FZj6dOAJpEAlf9vPnwyaLTsFV0J e8MA== X-Gm-Message-State: AOAM533IBapdEfVTCtTO24NkH1I3a4Jm/j4OACG1jATEgd38xDegIydw Uced+qyg7bPT/1IN+de87ap70/hVQO4= X-Google-Smtp-Source: ABdhPJzIWcI6g5ObhNZLCMlHxBPrbOLOvP3ifYie2ICcBf9aIq0xRn8DC4N1Wa2yTCVV/3Spd8lGpw== X-Received: by 2002:adf:ba49:: with SMTP id t9mr52686909wrg.183.1609181136594; Mon, 28 Dec 2020 10:45:36 -0800 (PST) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id q1sm55526655wrj.8.2020.12.28.10.45.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Dec 2020 10:45:36 -0800 (PST) From: Vincent Legoll Date: Mon, 28 Dec 2020 19:45:25 +0100 Message-Id: <20201228184525.21537-2-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228184525.21537-1-vincent.legoll@gmail.com> References: <20201228184525.21537-1-vincent.legoll@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vincent Legoll Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 2.78 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=gmail.com header.s=20161025 header.b=o2ArgPeh; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 505979402A9 X-Spam-Score: 2.78 X-Migadu-Scanner: scn1.migadu.com X-TUID: hdxDPE7JtNjy * 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