From e1b65899175bfe60c61d429fe14e348e17dad5d1 Mon Sep 17 00:00:00 2001 From: Changgyu Choi Date: Wed, 21 Dec 2022 14:26:15 +0900 Subject: [PATCH] Modify gcov installation directory Change-Id: I8d4a9e8ba94007f8682a55109e3beae71578bbb7 Signed-off-by: Changgyu Choi --- CMakeLists.txt | 2 +- packaging/appcore-widget.spec | 48 +++++++++++++++++++++++++++++++++--------- test/unit_tests/CMakeLists.txt | 2 ++ 3 files changed, 41 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a35ef8d..de092fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ SET(TARGET_WIDGET_BASE "appcore-widget-base") SET(TARGET_WIDGET_APPLICATION "capi-appfw-widget-application") ENABLE_TESTING() -SET(TARGET_WIDGET_APPLICATION_UNIT_TEST "appcore-widget-unit-test") +SET(TARGET_WIDGET_APPLICATION_UNIT_TEST "appcore-widget-unittest") INCLUDE(FindPkgConfig) INCLUDE(ApplyPkgConfig) diff --git a/packaging/appcore-widget.spec b/packaging/appcore-widget.spec index 65d4319..d60c6fc 100644 --- a/packaging/appcore-widget.spec +++ b/packaging/appcore-widget.spec @@ -85,23 +85,47 @@ export LDFLAGS+=" -lgcov" export CFLAGS+=" -DEFL_BETA_API_SUPPORT " MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DBIN_INSTALL_DIR:PATH=%{_bindir} %__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/%{name} -install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj/%{name} +builddir=$(basename $PWD) +gcno_obj_dir=%{buildroot}%{_datadir}/gcov/obj/%{name}/"$builddir" +mkdir -p "$gcno_obj_dir" +find . -name '*.gcno' -exec cp --parents '{}' "$gcno_obj_dir" ';' %endif +cat << EOF > run-unittest.sh +#!/bin/sh +setup() { + echo "setup start" +} + +test_main() { + echo "test_main start" + /usr/bin/appcore-widget-unittest +} + +teardown() { + echo "teardown start" +} + +main() { + setup + test_main + teardown +} + +main "\$*" +EOF + +mkdir -p %{buildroot}%{_bindir}/tizen-unittests/%{name} +install -m 0755 run-unittest.sh %{buildroot}%{_bindir}/tizen-unittests/%{name}/ + %check export LD_LIBRARY_PATH=../../src/base:../../src/efl_base ctest -V @@ -109,7 +133,7 @@ ctest -V lcov -c --ignore-errors graph --no-external -q -d . -o appcore-widget.info genhtml appcore-widget.info -o appcore-widget.out zip -r appcore-widget.zip appcore-widget.out -install -m 0644 appcore-widget.zip %{buildroot}%{_datadir}/gcov/ +install -m 0644 appcore-widget.zip %{buildroot}%{_datadir}/gcov/obj/ %endif %post -p /sbin/ldconfig @@ -142,7 +166,11 @@ install -m 0644 appcore-widget.zip %{buildroot}%{_datadir}/gcov/ %{_libdir}/pkgconfig/capi-appfw-widget-application.pc %{_libdir}/libcapi-appfw-widget-application.so +%files -n appcore_widget_unittests +%{_bindir}/appcore-widget-unittest +%{_bindir}/tizen-unittests/%{name}/run-unittest.sh + %if 0%{?gcov:1} %files gcov -%{_datadir}/gcov/* +%{_datadir}/gcov/obj/* %endif diff --git a/test/unit_tests/CMakeLists.txt b/test/unit_tests/CMakeLists.txt index 7a2beb7..af79f85 100644 --- a/test/unit_tests/CMakeLists.txt +++ b/test/unit_tests/CMakeLists.txt @@ -40,3 +40,5 @@ ADD_TEST( NAME ${TARGET_WIDGET_APPLICATION_UNIT_TEST} COMMAND ${TARGET_WIDGET_APPLICATION_UNIT_TEST} ) + +INSTALL (PROGRAMS ${TARGET_WIDGET_APPLICATION_UNIT_TEST} DESTINATION ${BIN_INSTALL_DIR}) -- 2.7.4