Add gmock package dependency and enable tests

Change-Id: Idd2a1c392844248934734be3668952b392fda272

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85bcfdb..98a2f1f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,3 +61,4 @@ SET(TARGET_CYNARA_COMMON "cynara-commons")
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(build)
 ADD_SUBDIRECTORY(systemd)
+ADD_SUBDIRECTORY(test)

diff --git a/packaging/cynara-tests.manifest b/packaging/cynara-tests.manifest
new file mode 100644 (file)
index 0000000..a76fdba
--- /dev/null
+++ b/packaging/cynara-tests.manifest
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="_" />
+       </request>
+</manifest>

diff --git a/packaging/cynara.spec b/packaging/cynara.spec
index 36d1f73..8ab687f 100644 (file)
--- a/packaging/cynara.spec
+++ b/packaging/cynara.spec
@@ -8,6 +8,7 @@ Source0:    %{name}-%{version}.tar.gz
 Source1001:    cynara.manifest
 Source1002:    libcynara-client.manifest
 Source1003:    libcynara-admin.manifest
+Source1004:    cynara-tests.manifest
 BuildRequires: cmake
 BuildRequires: zip
 BuildRequires: pkgconfig(libsystemd-daemon)
@@ -73,11 +74,21 @@ Requires:   cynara = %{version}-%{release}
 %description -n cynara-devel
 service (devel version)
 
+#######################################################
+%package -n cynara-tests
+Summary:    Cynara tests
+BuildRequires: pkgconfig(gmock)
+
+%description -n cynara-tests
+cynara tests
+
+
 %prep
 %setup -q
 cp -a %{SOURCE1001} .
 cp -a %{SOURCE1002} .
 cp -a %{SOURCE1003} .
+cp -a %{SOURCE1004} .
 
 %build
 %if 0%{?sec_build_binary_debug_enable}
@@ -193,3 +204,7 @@ fi
 %{_includedir}/cynara/cynara-admin.h
 %{_libdir}/pkgconfig/cynara-admin.pc
 %{_libdir}/libcynara-admin.so
+
+%files -n cynara-tests
+%manifest cynara-tests.manifest
+%attr(755,root,root) /usr/bin/cynara-tests

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index daac15c..6da8da4 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -20,7 +20,9 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3)
 PROJECT("cynara-tests")
 
-ADD_SUBDIRECTORY(${GMOCK_DIR} gmock)
+PKG_CHECK_MODULES(PKGS REQUIRED gmock_main)
+
+SET(CYNARA_SRC ${PROJECT_SOURCE_DIR}/../src)
 
 SET(CYNARA_SOURCES_FOR_TESTS
     ${CYNARA_SRC}/service/storage/Storage.cpp
@@ -48,8 +50,7 @@ SET(CYNARA_TESTS_SOURCES
 )
 
 INCLUDE_DIRECTORIES(
-    ${GMOCK_DIR}/include
-    ${GMOCK_DIR}/gtest/include
+    ${PKGS_INCLUDE_DIRS}
     ${CYNARA_SRC}
     ${CYNARA_SRC}/common
     ${CYNARA_SRC}/include
@@ -67,5 +68,7 @@ FIND_PACKAGE(Threads)
 
 TARGET_LINK_LIBRARIES(cynara-tests
     ${CMAKE_THREAD_LIBS_INIT}
-    gmock gtest_main
+    ${PKGS_LDFLAGS} ${PKGS_LIBRARIES}
 )
+
+INSTALL(TARGETS cynara-tests DESTINATION bin)