guix_mirror_bot pushed a commit to branch c++-team
in repository guix.
commit bf7b0daaa842984972bb6d0712de146346a90105
Author: Greg Hogan <[email protected]>
AuthorDate: Tue May 6 17:34:27 2025 +0000
gnu: rapidjson: Fix tests.
* gnu/packages/web.scm (rapidjson):
[arguments]<#:configure-flags>: Ignore error from free of nonheap object
during test compilation.
<#:phases>: Add phases to skip test reliant on deleted configuration
files and use system googletest.
[native-inputs]: Add valgrind/pinned.
[inputs]: Add googletest.
Change-Id: Ia81086b12c7180d3f02518bb4422a5069345335f
---
gnu/packages/web.scm | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index b67eeb6ab2..8d633a4170 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -1711,12 +1711,27 @@ current version of any major web browser.")
(delete-file-recursively "bin/jsonchecker")))))
(build-system cmake-build-system)
(arguments
- '(#:phases
+ '(#:configure-flags (list "-DCMAKE_CXX_FLAGS=-Wno-free-nonheap-object")
+ #:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-march=native
(lambda _
(substitute* "CMakeLists.txt"
- (("-m[^-]*=native") "")))))))
+ (("-m[^-]*=native") ""))))
+ (add-after 'fix-march=native 'skip-deleted-tests
+ (lambda _
+ (substitute* "test/unittest/CMakeLists.txt"
+ (("jsoncheckertest.cpp") ""))))
+ (add-after 'fix-march=native 'fix-dependencies
+ (lambda _
+ (substitute* "test/CMakeLists.txt"
+ (("^find_package\\(GTestSrc\\)")
+ "find_package(GTest REQUIRED)")
+ ((".*GTEST_SOURCE_DIR.*") "")
+ (("GTESTSRC_FOUND)")
+ "GTest_FOUND)")))))))
+ (native-inputs (list valgrind/pinned))
+ (inputs (list googletest))
(home-page "https://github.com/Tencent/rapidjson";)
(synopsis "JSON parser/generator for C++ with both SAX/DOM style API")
(description
