fix the merge conflict again

Former-commit-id: ef05797165bc42d33e4e8b4709ee4bb988f3797e

cpp/CHANGELOG.md

@@ -93,7 +93,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-488 - Improve code format in scheduler
 - MS-495 - cmake: integrated knowhere
 - MS-496 - Change the top_k limitation from 1024 to 2048
-- MS-505 - Install core unit test
+- MS-505 - Install core unit test and add to coverage
 
 ## New Feature
 - MS-343 - Implement ResourceMgr

cpp/coverage.sh

@@ -95,6 +95,7 @@ ${LCOV_CMD} -r "${FILE_INFO_OUTPUT}" -o "${FILE_INFO_OUTPUT_NEW}" \
     "*/boost/*" \
     "*/cmake_build/*_ep-prefix/*" \
     "src/core/cmake_build*" \
+    "src/core/thirdparty*" \
 
 # gen html report
 ${LCOV_GEN_CMD} "${FILE_INFO_OUTPUT_NEW}" --output-directory ${DIR_LCOV_OUTPUT}/
\ No newline at end of file

cpp/src/core/CMakeLists.txt

@@ -72,6 +72,10 @@ include(ThirdPartyPackagesCore)
 
 add_subdirectory(src)
 
+if (BUILD_COVERAGE STREQUAL "ON")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
+endif()
+
 set(CORE_INCLUDE_DIRS ${CORE_INCLUDE_DIRS} PARENT_SCOPE)
 
 if(BUILD_UNIT_TEST STREQUAL "ON")