From aabcb1fd9b96ca696f4f42a6ef5fcc11c00b5bf9 Mon Sep 17 00:00:00 2001 From: Inkyun Kil Date: Fri, 29 Mar 2024 10:13:28 +0900 Subject: [PATCH] Fix build issue for cion-mod-unittest Change-Id: I0c1d93d3b2f5bc26b3d61fa6e43fff97940b387a Signed-off-by: Inkyun Kil --- packaging/esd.spec | 2 +- tests/cion_unit_tests/CMakeLists.txt | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/packaging/esd.spec b/packaging/esd.spec index fa0c97b..5d12c2b 100644 --- a/packaging/esd.spec +++ b/packaging/esd.spec @@ -113,7 +113,7 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` make %{?jobs:-j%jobs} %check -##ctest -V +ctest -V %if 0%{?gcov:1} lcov -c --ignore-errors mismatch,graph,unused --no-external -b . -d . -o %{name}.info diff --git a/tests/cion_unit_tests/CMakeLists.txt b/tests/cion_unit_tests/CMakeLists.txt index 2ae201c..7fa082e 100644 --- a/tests/cion_unit_tests/CMakeLists.txt +++ b/tests/cion_unit_tests/CMakeLists.txt @@ -1,19 +1,27 @@ AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../../src/modules/cion/ ESD_MOD_CION_SRCS) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../../src/lib/ ESD_LIB_SRCS) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src/ ESD_MOD_CION_TEST_SRCS) -AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../mock/ ESD_MOD_CION_MOCK_SRCS) + +SET(MOCK_SRCS + ${CMAKE_CURRENT_SOURCE_DIR}/../mock/tzplatform_config_mock.cc + ${CMAKE_CURRENT_SOURCE_DIR}/../mock/pkgmgr_info_mock.cc + ${CMAKE_CURRENT_SOURCE_DIR}/../mock/test_fixture.cc + ${CMAKE_CURRENT_SOURCE_DIR}/../mock/cion_mock.cc +) + ADD_EXECUTABLE(${TARGET_ESD_MOD_CION_UNITTESTS} ${ESD_MOD_CION_SRCS} ${ESD_LIB_SRCS} ${ESD_MOD_CION_TEST_SRCS} - ${ESD_MOD_CION_MOCK_SRCS} + ${MOCK_SRCS} ) TARGET_INCLUDE_DIRECTORIES(${TARGET_ESD_MOD_CION_UNITTESTS} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../src/modules) TARGET_INCLUDE_DIRECTORIES(${TARGET_ESD_MOD_CION_UNITTESTS} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../) - +TARGET_INCLUDE_DIRECTORIES(${TARGET_ESD_MOD_CION_UNITTESTS} PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/../mock/) TARGET_LINK_LIBRARIES(${TARGET_ESD_MOD_CION_UNITTESTS} PRIVATE ${TARGET_LIB_ESD}) APPLY_PKG_CONFIG(${TARGET_ESD_MOD_CION_UNITTESTS} PUBLIC @@ -32,9 +40,6 @@ APPLY_PKG_CONFIG(${TARGET_ESD_MOD_CION_UNITTESTS} PUBLIC SQLITE3_DEPS DATABASE_DEPS SECURITY_MANAGER_DEPS - CYNARA_CLIENT_DEPS - CYNARA_CREDS_DBUS_DEPS - CYNARA_SESSION_DEPS GMOCK_DEPS ) -- 2.34.1