Fix build issue for cion-mod-unittest

Change-Id: I0c1d93d3b2f5bc26b3d61fa6e43fff97940b387a
Signed-off-by: Inkyun Kil <inkyun.kil@samsung.com>

diff --git a/packaging/esd.spec b/packaging/esd.spec
index fa0c97b..5d12c2b 100644 (file)
--- 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 (file)
--- 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)\r
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../../src/lib/ ESD_LIB_SRCS)\r
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src/ ESD_MOD_CION_TEST_SRCS)\r
-AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../mock/ ESD_MOD_CION_MOCK_SRCS)\r
+\r
+SET(MOCK_SRCS\r
+  ${CMAKE_CURRENT_SOURCE_DIR}/../mock/tzplatform_config_mock.cc\r
+  ${CMAKE_CURRENT_SOURCE_DIR}/../mock/pkgmgr_info_mock.cc\r
+  ${CMAKE_CURRENT_SOURCE_DIR}/../mock/test_fixture.cc\r
+  ${CMAKE_CURRENT_SOURCE_DIR}/../mock/cion_mock.cc\r
+)\r
+\r
 ADD_EXECUTABLE(${TARGET_ESD_MOD_CION_UNITTESTS}\r
   ${ESD_MOD_CION_SRCS}\r
   ${ESD_LIB_SRCS}\r
   ${ESD_MOD_CION_TEST_SRCS}\r
-  ${ESD_MOD_CION_MOCK_SRCS}\r
+  ${MOCK_SRCS}\r
 )\r
 \r
 TARGET_INCLUDE_DIRECTORIES(${TARGET_ESD_MOD_CION_UNITTESTS} PUBLIC\r
   ${CMAKE_CURRENT_SOURCE_DIR}/../../src/modules)\r
 TARGET_INCLUDE_DIRECTORIES(${TARGET_ESD_MOD_CION_UNITTESTS} PUBLIC\r
   ${CMAKE_CURRENT_SOURCE_DIR}/../)\r
-\r
+TARGET_INCLUDE_DIRECTORIES(${TARGET_ESD_MOD_CION_UNITTESTS} PUBLIC\r
+  ${CMAKE_CURRENT_SOURCE_DIR}/../mock/)\r
 TARGET_LINK_LIBRARIES(${TARGET_ESD_MOD_CION_UNITTESTS} PRIVATE ${TARGET_LIB_ESD})\r
 \r
 APPLY_PKG_CONFIG(${TARGET_ESD_MOD_CION_UNITTESTS} PUBLIC\r
@@ -32,9 +40,6 @@ APPLY_PKG_CONFIG(${TARGET_ESD_MOD_CION_UNITTESTS} PUBLIC
   SQLITE3_DEPS\r
   DATABASE_DEPS\r
   SECURITY_MANAGER_DEPS\r
-  CYNARA_CLIENT_DEPS\r
-  CYNARA_CREDS_DBUS_DEPS\r
-  CYNARA_SESSION_DEPS\r
   GMOCK_DEPS\r
 )\r
 \r