From: hyunho <hhstark.kang@samsung.com>
Date: Mon, 17 Feb 2020 09:23:39 +0000 (+0900)
Subject: Merge branch 'tizen' into tizen_5.5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2645f5318787b7064ce41525891b13de174a68e1;hp=90a3a1cc18d4cf86e37d447c305de616c76b506b;p=platform%2Fcore%2Fappfw%2Fappcore-widget.git

Merge branch 'tizen' into tizen_5.5
---

diff --git a/packaging/appcore-widget.spec b/packaging/appcore-widget.spec
index 7be64cd..6488763 100644
--- a/packaging/appcore-widget.spec
+++ b/packaging/appcore-widget.spec
@@ -1,6 +1,6 @@
 Name:       appcore-widget
 Summary:    Widget Application
-Version:    1.3.5
+Version:    1.3.6
 Release:    1
 Group:      Application Framework/Libraries
 License:    Apache-2.0
@@ -47,19 +47,45 @@ Requires:   %{name} = %{version}-%{release}
 %description -n capi-appfw-widget-application-devel
 widget application (development files)
 
+%if 0%{?gcov:1}
+%package gcov
+Summary:  Widget application API(gcov)
+Group:    Application Framework/Libraries
+
+%description gcov
+gcov objects of a widget application library
+%endif
+
 %prep
 %setup -q
 
 %build
+%if 0%{?gcov:1}
+export CFLAGS+=" -fprofile-arcs -ftest-coverage"
+export CXXFLAGS+=" -fprofile-arcs -ftest-coverage"
+export FFLAGS+=" -fprofile-arcs -ftest-coverage"
+export LDFLAGS+=" -lgcov"
+%endif
+
 export CFLAGS+=" -DEFL_BETA_API_SUPPORT "
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 %__make %{?jobs:-j%jobs}
 
+%if 0%{?gcov:1}
+mkdir -p gcov-obj
+find . -name '*.gcno' -exec cp '{}' gcov-obj ';'
+%endif
+
 %install
 rm -rf %{buildroot}
 %make_install
 
+%if 0%{?gcov:1}
+mkdir -p %{buildroot}%{_datadir}/gcov/obj
+install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj
+%endif
+
 mkdir -p %{buildroot}%{_libdir}/pkgconfig
 cp capi-appfw-widget-application.pc %{buildroot}%{_libdir}/pkgconfig
 
@@ -92,3 +118,7 @@ cp capi-appfw-widget-application.pc %{buildroot}%{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/capi-appfw-widget-application.pc
 %{_libdir}/libcapi-appfw-widget-application.so
 
+%if 0%{?gcov:1}
+%files gcov
+%{_datadir}/gcov/obj/*
+%endif
diff --git a/src/base/widget_base.c b/src/base/widget_base.c
index c11f0af..17edb5d 100644
--- a/src/base/widget_base.c
+++ b/src/base/widget_base.c
@@ -525,6 +525,8 @@ static void __control_destroy(const char *class_id, const char *id, bundle *b)
 	free(data->id);
 	free(data);
 	__check_empty_instance();
+	aul_widget_write_log(LOG_TAG,
+		"[%s:%d] instance_id(%s)", __FUNCTION__, __LINE__, id);
 }
 
 static void __control_change_period(const char *class_id, const char *id,
@@ -639,6 +641,7 @@ static int __multiwindow_control(bundle *b, void *data)
 		return 0;
 	}
 
+	LOGI("app control operation(%s)", operation);
 	if (strcmp(operation, "create") == 0)
 		__control_create(class_id, id, b);
 	else if (strcmp(operation, "resize") == 0)