From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 4NR+F5lQ0WRcyQAASxT56A (envelope-from ) for ; Mon, 07 Aug 2023 22:14:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id yL+dFplQ0WQtIQEAG6o9tA (envelope-from ) for ; Mon, 07 Aug 2023 22:14:17 +0200 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 E3A354B6D0 for ; Mon, 7 Aug 2023 22:14:16 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=greghogan-com.20221208.gappssmtp.com header.s=20221208 header.b=TPCwiK82; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1691439257; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=OPSuaJuRc1Dgpzjt8x9YdIIb3eqr+DJgWzainIg3D0U=; b=Kfw2PQ3iil94Ffp8iB94MOn0YMGWxG75iw03IYsdTxAXOVN296PJunqvDup77qNFTJEDGR TizTn/FDYbnGzbnGNFo0FqoVOJMQ3f30xgbNWLWcqGvwZa5NocANRrPYHOE8OZITrxfvP0 LtnCWpF9xYVV47BydOZJ0ylNHUZmCWgeLfePCKqxcRCiDwIB5coocjR+2lQDmRl57HbIIM Ck3d/mo6DrqlY8x3d9FXVFdFgCAt3tRILVKBiMOEP7UL3RROMuXSRM/tvS0ZgwChV8+5E/ cLYCl7Kk821l7cOxHIAWnVBstwWcm6ZrSDbY8FMXLc1tbBhHqlSDDzbauMWbRg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=greghogan-com.20221208.gappssmtp.com header.s=20221208 header.b=TPCwiK82; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1691439257; a=rsa-sha256; cv=none; b=CaYROTblCB4tWJWtM57KjisoecD1lVkskMm4R9PZen5TO9TjI6TcXbcwcThreSSgu/+8vO 0WL0ZZhinrdkl/uIlWF87N291eCdu8Ct0U+PN45iMXTCFkQHiH1QC1ROLJzT+RlVLO5/VL 74dLQTkwm2kXxxtcpCeLKRm51rrW3lSKe0Yg3xT6oy9SpeTVl5wsupZXOghYd1RwFVSbKz 3ZgG9V6Mac9l/irOcoxXEKefIxEbtrMM35vWJg10kcobAomyChdNuUeFcuD9r60MdSdZyP uxhBu+kibL2mNqKohw+UVYNt1YTQ9kxm5RA2493yeHKx2mASWDdce/wYFsZtuQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qT6cA-00039f-Js; Mon, 07 Aug 2023 16:14:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qT6c6-00038y-HP for guix-patches@gnu.org; Mon, 07 Aug 2023 16:14:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qT6c6-0005oF-9A for guix-patches@gnu.org; Mon, 07 Aug 2023 16:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qT6c6-0000Qr-4L for guix-patches@gnu.org; Mon, 07 Aug 2023 16:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65135] [PATCH 2/3] gnu: spdlog: Fix tests. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Aug 2023 20:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65135 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65135@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 65135-submit@debbugs.gnu.org id=B65135.16914391891567 (code B ref 65135); Mon, 07 Aug 2023 20:14:02 +0000 Received: (at 65135) by debbugs.gnu.org; 7 Aug 2023 20:13:09 +0000 Received: from localhost ([127.0.0.1]:34457 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT6bE-0000PB-Eb for submit@debbugs.gnu.org; Mon, 07 Aug 2023 16:13:08 -0400 Received: from mail-yw1-x112c.google.com ([2607:f8b0:4864:20::112c]:51472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT6bB-0000ON-Ie for 65135@debbugs.gnu.org; Mon, 07 Aug 2023 16:13:07 -0400 Received: by mail-yw1-x112c.google.com with SMTP id 00721157ae682-58451f0fefeso56969397b3.3 for <65135@debbugs.gnu.org>; Mon, 07 Aug 2023 13:13:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20221208.gappssmtp.com; s=20221208; t=1691439180; x=1692043980; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OPSuaJuRc1Dgpzjt8x9YdIIb3eqr+DJgWzainIg3D0U=; b=TPCwiK82i4opis9dXi80URuj4/S98cwDwQVr/90h9qgQZxmuisIpqs80+euMJ3I/vz 9/TgSlADgCwgZ0WY323S5lVw56ZnpquysFA4fwVp2m0Jn7IPxhpB5Cnlamyn25AipHBh egaUeoTzPdL+HF+rcqGRgCnAVxpMOBtQotvp7um/Owe4uBb/LDp0yNRqHhhjP6ehQSAA hx7Q2cJw5XRXY3eN2RFhmqNEP6a7rSB9Gnir1U16iUiBqzvlkjeYsOvAQEtmJQCSJF4B maDKdopscQ2IE+7Ib5+7nkHhktbF91rCjIMnboSuGkL6ebY32waWzigR1sgy0HdYpDD9 CzPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691439180; x=1692043980; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OPSuaJuRc1Dgpzjt8x9YdIIb3eqr+DJgWzainIg3D0U=; b=J/24EGm/YtmlsJ2R5SKk87mXLGrYF0ooOPaCJYJXvFlcIQ0CAC0GNm9kA8M3RRxIQp KGwPzuQVA8dzV/xZTHcNfV6r/L8YdkSp3ryFKcGCGKQdKNvFET3ptGRg8XV4FgCjaUl1 ffz4pQ6zq3wGnykgbuGUsPG1dgTje42VAELtigkM5VtINuuRGd7TdmxaKjHP+ggSPGVn yUCoFY51fkNtz2Nki7i79Z4wdJmAREVFQT5wNJi+pdbk9vqz5caS3CIBFaetKBCzyMXh th0jFPB2K7tFYUexlJ9mSy6oq0A5b2GN1dMVsNKcytv80Tky/5to5cmB7FOgEHgk1561 Mp7A== X-Gm-Message-State: AOJu0YzxisVRP3DOFnIkpktr4OY0QGdV5VBQGgMIZtg2lB1tCUev51xG WgOig87sAiCkGYaYSKSLq5mY4PNdu8C6u6jzXnpxdQ== X-Google-Smtp-Source: AGHT+IGIk/kgHBgWS9FQuug1Xy0c81mjG7DRj/NdqjFnIO6J7yzYcY5pi25cTR9nv0JyT5Bt7rOBRA== X-Received: by 2002:a0d:ff84:0:b0:583:2df2:35f3 with SMTP id p126-20020a0dff84000000b005832df235f3mr10615707ywf.1.1691439180032; Mon, 07 Aug 2023 13:13:00 -0700 (PDT) Received: from ip-172-31-19-221.us-east-2.compute.internal (ec2-3-144-210-165.us-east-2.compute.amazonaws.com. [3.144.210.165]) by smtp.gmail.com with ESMTPSA id s4-20020a0dd004000000b005704c4d3579sm2900789ywd.40.2023.08.07.13.12.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 13:12:59 -0700 (PDT) From: Greg Hogan Date: Mon, 7 Aug 2023 20:12:34 +0000 Message-ID: <20230807201256.44051-2-code@greghogan.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230807201256.44051-1-code@greghogan.com> References: <20230807201256.44051-1-code@greghogan.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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: E3A354B6D0 X-Migadu-Scanner: mx1.migadu.com X-Spam-Score: -0.66 X-Migadu-Spam-Score: -0.66 X-TUID: 70ULeUsIQ9H0 * gnu/packages/patches/spdlog-fix-tests.patch: New file. * gnu/local.mk: Add it. * gnu/packages/logging.scm (spdlog)[source]: Use patch. --- gnu/local.mk | 1 + gnu/packages/logging.scm | 1 + gnu/packages/patches/spdlog-fix-tests.patch | 26 +++++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 gnu/packages/patches/spdlog-fix-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 77707127a7..af5eea1791 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1961,6 +1961,7 @@ dist_patch_DATA = \ %D%/packages/patches/source-highlight-gcc-compat.patch \ %D%/packages/patches/softhsm-fix-openssl3-tests.patch \ %D%/packages/patches/spectre-meltdown-checker-externalize-fwdb.patch \ + %D%/packages/patches/spdlog-fix-tests.patch \ %D%/packages/patches/spectre-meltdown-checker-find-kernel.patch \ %D%/packages/patches/sphinxbase-fix-doxygen.patch \ %D%/packages/patches/sssd-system-directories.patch \ diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index abeb3fdd5c..c204a013b4 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -221,6 +221,7 @@ (define-public spdlog (url "https://github.com/gabime/spdlog") (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (patches (search-patches "spdlog-fix-tests.patch")) (sha256 (base32 "0yyncv6wjs5rqm76rkqyxpfbsingk1dq5zfcqhy1a7fpw8xdl53k")))) (build-system cmake-build-system) diff --git a/gnu/packages/patches/spdlog-fix-tests.patch b/gnu/packages/patches/spdlog-fix-tests.patch new file mode 100644 index 0000000000..0eaf1d485d --- /dev/null +++ b/gnu/packages/patches/spdlog-fix-tests.patch @@ -0,0 +1,26 @@ +Remove after next release and package update: +https://github.com/gabime/spdlog/commit/2ee8bac78e6525a8ad9a9196e65d502ce390d83a + +From 2ee8bac78e6525a8ad9a9196e65d502ce390d83a Mon Sep 17 00:00:00 2001 +From: xvitaly +Date: Sun, 23 Jul 2023 10:15:25 +0200 +Subject: [PATCH] Added missing square bracket to fix the level_to_string_view + test. (#2827) + +--- + tests/test_misc.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/test_misc.cpp b/tests/test_misc.cpp +index 9f3cb1744..6199641ff 100644 +--- a/tests/test_misc.cpp ++++ b/tests/test_misc.cpp +@@ -43,7 +43,7 @@ TEST_CASE("log_levels", "[log_levels]") + REQUIRE(log_info("Hello", spdlog::level::trace) == "Hello"); + } + +-TEST_CASE("level_to_string_view", "[convert_to_string_view") ++TEST_CASE("level_to_string_view", "[convert_to_string_view]") + { + REQUIRE(spdlog::level::to_string_view(spdlog::level::trace) == "trace"); + REQUIRE(spdlog::level::to_string_view(spdlog::level::debug) == "debug"); -- 2.41.0