Compare commits

...

2 Commits

Author SHA1 Message Date
David Abdurachmanov 6d653faac6
Add missing patch
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2022-10-18 11:33:31 +03:00
David Abdurachmanov 9bd5917279
Remove valgrind unit test
See (there is a proper patch too):
https://github.com/Tencent/rapidjson/issues/1808

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2022-10-18 11:21:30 +03:00
2 changed files with 24 additions and 1 deletions

View File

@ -2,7 +2,7 @@
Name: rapidjson
Version: 1.1.0
Release: 20%{?dist}
Release: 20.0.riscv64%{?dist}
Summary: Fast JSON parser and generator for C++
License: MIT
@ -13,11 +13,15 @@ Patch0: rapidjson-1.1.0-do_not_include_gtest_src_dir.patch
# Upstream derived patch for C++20 support
Patch1: rapidjson-1.1.0-c++20.patch
Patch10: remove-valgrind-unit-test.patch
BuildRequires: cmake
BuildRequires: make
BuildRequires: gcc-c++
BuildRequires: gtest-devel
%ifarch %{valgrind_arches}
BuildRequires: valgrind
%endif
BuildRequires: doxygen
%description
@ -115,6 +119,9 @@ find %{buildroot} -type f -name 'CMake*.txt' -delete
%changelog
* Tue Oct 18 2022 David Abdurachmanov <davidlt@rivosinc.com> - 1.1.0-20.0.riscv64
- Disable valgrind on riscv64
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

View File

@ -0,0 +1,16 @@
diff --git a/test/unittest/CMakeLists.txt b/test/unittest/CMakeLists.txt
index 15d29ea..3b4f75e 100644
--- a/test/unittest/CMakeLists.txt
+++ b/test/unittest/CMakeLists.txt
@@ -78,11 +78,6 @@ add_test(NAME unittest
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
if(NOT MSVC)
- # Not running SIMD.* unit test cases for Valgrind
- add_test(NAME valgrind_unittest
- COMMAND valgrind --leak-check=full --error-exitcode=1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest --gtest_filter=-SIMD.*
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
-
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
add_test(NAME symbol_check
COMMAND sh -c "objdump -t -C libnamespacetest.a | grep rapidjson ; test $? -ne 0"