From: Greg Hogan <code@greghogan.com>
To: 65135@debbugs.gnu.org
Cc: Greg Hogan <code@greghogan.com>
Subject: [bug#65135] [PATCH 2/3] gnu: spdlog: Fix tests.
Date: Mon, 7 Aug 2023 20:12:34 +0000 [thread overview]
Message-ID: <20230807201256.44051-2-code@greghogan.com> (raw)
In-Reply-To: <20230807201256.44051-1-code@greghogan.com>
* 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 <vitaly@easycoding.org>
+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
next prev parent reply other threads:[~2023-08-07 20:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-07 20:10 [bug#65135] [PATCH 0/3] Update catch2 Greg Hogan
2023-08-07 20:12 ` [bug#65135] [PATCH 1/3] gnu: catch2: Update to 3.4.0 Greg Hogan
2023-08-07 20:12 ` Greg Hogan [this message]
2023-08-07 20:12 ` [bug#65135] [PATCH 3/3] gnu: vbz-compression: Update to 1.0.3 Greg Hogan
2023-08-27 18:55 ` bug#65135: [PATCH 0/3] Update catch2 Christopher Baines
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=20230807201256.44051-2-code@greghogan.com \
--to=code@greghogan.com \
--cc=65135@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.