From 82556ca0cf045bdc2c9050c5725ee9229143409a Mon Sep 17 00:00:00 2001 From: Sunghyun Kim Date: Mon, 27 Apr 2020 19:32:44 +0900 Subject: [PATCH] Fix build error when gcov is enabled widget-viewer-dali don't have a unittest. but before spec try to check unittest when gcov is enabled. so i delete this part for fix build error. Change-Id: I841bb57c579001307a0fe95cdcedaec7c9a4e35d --- build/tizen/CMakeLists.txt | 2 +- packaging/widget-viewer-dali.spec | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index 361cb92..db7f09d 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -65,7 +65,7 @@ FOREACH(flag ${viewer_dali_CFLAGS}) ENDFOREACH(flag) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -DHIDE_DALI_INTERNALS -Wall -Werror -Winline -g") -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fprofile-arcs -ftest-coverage") SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") SET(CMAKE_C_FLAGS_RELEASE "-O2") diff --git a/packaging/widget-viewer-dali.spec b/packaging/widget-viewer-dali.spec index 121b303..ff76152 100644 --- a/packaging/widget-viewer-dali.spec +++ b/packaging/widget-viewer-dali.spec @@ -24,7 +24,6 @@ BuildRequires: pkgconfig(wayland-tbm-client) BuildRequires: pkgconfig(screen_connector_watcher) %if 0%{?gcov:1} BuildRequires: lcov -BuildRequires: zip %endif %if 0%{?tizen_version_major} >= 5 @@ -114,16 +113,6 @@ mkdir -p gcov-obj find . -name '*.gcno' -exec cp '{}' gcov-obj ';' %endif -%check -ctest --output-on-failure %{?_smp_mflags} -%if 0%{?gcov:1} -lcov -c --ignore-errors graph --no-external -q -d . -o widget-viewer-dali.info -genhtml widget-viewer-dali.info -o widget-viewer-dali.out -zip -r widget-viewer-dali.zip widget-viewer-dali.out widget-viewer-dali.info -install -m 0644 widget-viewer-dali.zip %{buildroot}%{_datadir}/gcov/ -%endif - - ############################## # Installation ############################## @@ -171,4 +160,9 @@ exit 0 %{_includedir}/widget_viewer_dali/* %{_libdir}/pkgconfig/widget_viewer_dali.pc +%if 0%{?gcov:1} +%files gcov +%{_datadir}/gcov/obj/* +%endif + # End of a file -- 2.34.1