Modify gcov installation directory

Change-Id: I86aa0cd919e436fa42c78b7041b96924219f74cd
Signed-off-by: Changgyu Choi <changyu.choi@samsung.com>

diff --git a/packaging/capi-system-media-key.spec b/packaging/capi-system-media-key.spec
index 241760a..51664b9 100644 (file)
--- a/packaging/capi-system-media-key.spec
+++ b/packaging/capi-system-media-key.spec
@@ -31,6 +31,12 @@ Requires: %{name} = %{version}
 %description devel
 %devel_desc
 
+%package unittests
+Summary:    %{name} unittests binary
+
+%description unittests
+unittests binary
+
 %if 0%{?gcov:1}
 %package gcov
 Summary:  A media key library(gcov)
@@ -57,30 +63,55 @@ export CXXFLAGS+=" -DEFL_BETA_API_SUPPORT "
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %cmake -DFULLVER=%{version} -DLIB_INSTALL_DIR=%{_libdir} \
        -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
 %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/mediakey-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
 (cd unittest && LD_LIBRARY_PATH=../ ctest -V)
 %if 0%{?gcov:1}
 lcov -c --ignore-errors graph --no-external -q -d . -o media_key.info
 genhtml media_key.info -o media_key.out
 zip -r media_key.zip media_key.out
-install -m 0644 media_key.zip %{buildroot}%{_datadir}/gcov/
+install -m 0644 media_key.zip %{buildroot}%{_datadir}/gcov/obj/
 %endif
 
 %post -p /sbin/ldconfig
@@ -98,7 +129,11 @@ install -m 0644 media_key.zip %{buildroot}%{_datadir}/gcov/
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/libcapi-system-media-key.so
 
+%files unittests
+%{_bindir}/mediakey-unittest
+%{_bindir}/tizen-unittests/%{name}/run-unittest.sh
+
 %if 0%{?gcov:1}
 %files gcov
-%{_datadir}/gcov/*
+%{_datadir}/gcov/obj/*
 %endif

diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
index dd9f809..92be4de 100644 (file)
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@@ -1,5 +1,5 @@
 ENABLE_TESTING()
-SET(TARGET_UNIT_TEST "mediakey-unit-test")
+SET(TARGET_UNIT_TEST "mediakey-unittest")
 
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/ UNIT_TESTS_SRCS)
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../mock/ UNIT_TESTS_SRCS)
@@ -21,3 +21,5 @@ ADD_TEST(
   NAME ${TARGET_UNIT_TEST}
   COMMAND ${TARGET_UNIT_TEST}
 )
+
+INSTALL(PROGRAMS ${TARGET_UNIT_TEST} DESTINATION ${BIN_INSTALL_DIR})