diff options
| author | Greg Hogan <code@greghogan.com> | 2023-08-07 20:12:34 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2023-08-27 19:16:45 +0100 |
| commit | 1ae56be99e124da33390573084bc56a01ce1dba8 (patch) | |
| tree | aebc43ba3601f61759bf1e5f15115aadf910db49 | |
| parent | 68b3d7180623dcf105e0171e013553e27e4f728d (diff) | |
gnu: spdlog: Fix tests.
* gnu/packages/patches/spdlog-fix-tests.patch: New file.
* gnu/local.mk: Add it.
* gnu/packages/logging.scm (spdlog)[source]: Use patch.
Signed-off-by: Christopher Baines <mail@cbaines.net>
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/logging.scm | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/spdlog-fix-tests.patch | 26 |
3 files changed, 28 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 04ef761af3..8f409b7ea8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1964,6 +1964,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 61b3d6ccc5..dbaf9fa7aa 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -220,6 +220,7 @@ output in multiple windows in a terminal.") (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 "0i3a1cqrg1sz0w50g7zz9x73rf838igqri12q8ijh4rzpq0qq3ch")))) (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..13dffb309e --- /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"); |