Fix build gcov issue

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09ed2a6..1793910 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,16 +27,13 @@ IF(_APPFW_FEATURE_ALARM_MANAGER_MODULE_LOG)
        INSTALL(FILES ${CMAKE_SOURCE_DIR}/alarmmgr_log_dump.sh DESTINATION ${TZ_SYS_ETC}/dump.d/module.d/)
 ENDIF(_APPFW_FEATURE_ALARM_MANAGER_MODULE_LOG)
 
-IF(BUILD_GTESTS)
+IF(BUILD_GCOV)
        SET(EXTRA_CFLAGS "-Werror-implicit-function-declaration")
-ELSE(BUILD_GTESTS)
+ELSE(BUILD_GCOV)
        SET(EXTRA_CFLAGS "-Werror-implicit-function-declaration -fvisibility=hidden")
-ENDIF(BUILD_GTESTS)
+ENDIF(BUILD_GCOV)
 
 IF(BUILD_GCOV)
        ADD_DEFINITIONS("-DTIZEN_TEST_GCOV")
-ENDIF(BUILD_GCOV)
-
-IF(BUILD_GTESTS)
        ADD_SUBDIRECTORY(unittest)
-ENDIF(BUILD_GTESTS)
+ENDIF(BUILD_GCOV)
\ No newline at end of file

diff --git a/packaging/alarm-manager.spec b/packaging/alarm-manager.spec
index 75c0f25..e80e406 100644 (file)
--- a/packaging/alarm-manager.spec
+++ b/packaging/alarm-manager.spec
@@ -44,7 +44,7 @@ BuildRequires:  lcov
 BuildRequires:  zip
 %endif
 
-%if 0%{?gtests:1}
+%if 0%{?gcov:1}
 BuildRequires: pkgconfig(gmock)
 %endif
 Requires(post): /sbin/ldconfig
@@ -173,7 +173,6 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
        -DTZ_SYS_ETC=%{TZ_SYS_ETC} \
        -D_APPFW_FEATURE_ALARM_MANAGER_MODULE_LOG:BOOL=${_APPFW_FEATURE_ALARM_MANAGER_MODULE_LOG} \
        -DALARM_CONF_DIR=%{_datadir}/alarm-manager \
-       -DBUILD_GTESTS=%{?gtests:1}%{!?gtests:0} \
        -DBUILD_GCOV=%{?gcov:1}%{!?gcov:0} \
 
 make %{?jobs:-j%jobs}
@@ -282,7 +281,7 @@ fi
 #################################################
 # unittests
 #################################################
-%if 0%{?gtests:1}
+%if 0%{?gcov:1}
 %files unittests
 %{_bindir}/gtest*
 %endif

diff --git a/unittest/alarmlib_unittest.cpp b/unittest/alarmlib_unittest.cpp
index 9690a14..4271da6 100755 (executable)
--- a/unittest/alarmlib_unittest.cpp
+++ b/unittest/alarmlib_unittest.cpp
@@ -30,8 +30,10 @@
 
 void __g_dbus_node_info_unref_fake(GDBusNodeInfo *info)
 {
-  free(info->interfaces);
-  free(info);
+   if (info && info->interfaces) {
+     free(info->interfaces);
+     free(info);
+   }
   info = NULL;
   return;
 }
@@ -60,8 +62,8 @@ GDBusNodeInfo* __g_dbus_node_info_new_for_xml_fake(const gchar *xml, GError **er
   if (!info)
     return NULL;
 
-  GDBusInterfaceInfo *interface =
-    (GDBusInterfaceInfo*)malloc(sizeof(GDBusInterfaceInfo));
+  GDBusInterfaceInfo **interface =
+    (GDBusInterfaceInfo**)malloc(sizeof(GDBusInterfaceInfo*));
   if (!interface) {
     free(info);
     return NULL;
@@ -69,7 +71,7 @@ GDBusNodeInfo* __g_dbus_node_info_new_for_xml_fake(const gchar *xml, GError **er
 
   info->ref_count = 10;
   info->path = NULL;
-  info->interfaces = &interface;
+  info->interfaces = interface;
   info->nodes = NULL;
   info->annotations = NULL;
 
@@ -162,7 +164,6 @@ class AlarmLibTest : public ::testing::Test {
 
       g_bus_get_sync_fake.custom_fake = __g_bus_get_sync_fake;
       g_dbus_proxy_new_sync_fake.custom_fake = __g_dbus_proxy_new_sync_fake;
-      g_dbus_node_info_unref_fake.custom_fake = __g_dbus_node_info_unref_fake;
     }
     void TearDown() override {
       alarmmgr_free_alarm(alarm);
@@ -180,6 +181,7 @@ TEST_F(AlarmLibTest, alarmmgr_init_p)
   g_dbus_connection_register_object_fake.custom_fake = __g_dbus_connection_register_object_fake;
   g_dbus_connection_unregister_object_fake.custom_fake = __g_dbus_connection_unregister_object_fake;
   g_bus_own_name_on_connection_fake.custom_fake = __g_bus_own_name_on_connection_fake;
+  g_dbus_node_info_unref_fake.custom_fake = __g_dbus_node_info_unref_fake;
 
   ret = alarmmgr_init(testapp);
   EXPECT_EQ(ALARMMGR_RESULT_SUCCESS, ret);