Merge cynara and cynara-tests spec files

Change-Id: I254584d5ef8a5e546be8bec4eb9e9629199306bc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85bcfdb..354d39b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,7 +57,9 @@ SET(TARGET_CYNARA "cynara")
 SET(TARGET_LIB_CYNARA "cynara-client")
 SET(TARGET_LIB_CYNARA_ADMIN "cynara-admin")
 SET(TARGET_CYNARA_COMMON "cynara-commons")
+SET(TARGET_CYNARA_TESTS "cynara-tests")
 
 ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(test)
 ADD_SUBDIRECTORY(build)
 ADD_SUBDIRECTORY(systemd)

diff --git a/packaging_tests/cynara-tests.manifest b/packaging/cynara-tests.manifest
similarity index 100%
rename from packaging_tests/cynara-tests.manifest
rename to packaging/cynara-tests.manifest

diff --git a/packaging/cynara.spec b/packaging/cynara.spec
index 8d9c94f..8bb7e14 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
 Requires:      default-ac-domains
 BuildRequires: cmake
 BuildRequires: zip
@@ -29,7 +30,8 @@ BuildRequires: pkgconfig(libunwind)
 %endif
 
 %description
-service and client libraries (libcynara-client, libcynara-admin)
+service, client libraries (libcynara-client, libcynara-admin)
+and tests (cynara-tests)
 
 #######################################################
 %package -n libcynara-client
@@ -66,6 +68,15 @@ Requires:   libcynara-admin = %{version}-%{release}
 admin client library (devel) for setting, listing and removing policies
 
 #######################################################
+%package -n cynara-tests
+Summary:    Cynara - cynara test binaries
+BuildRequires: pkgconfig(gmock)
+
+%description -n cynara-tests
+Cynara tests
+
+#######################################################
+
 %package -n cynara-devel
 Summary:    Cynara service (devel)
 Requires:   cynara = %{version}-%{release}
@@ -78,6 +89,7 @@ service (devel version)
 cp -a %{SOURCE1001} .
 cp -a %{SOURCE1002} .
 cp -a %{SOURCE1003} .
+cp -a %{SOURCE1004} .
 
 %build
 %if 0%{?sec_build_binary_debug_enable}
@@ -199,3 +211,7 @@ fi
 %{_includedir}/cynara/cynara-admin.h
 %{_libdir}/libcynara-admin.so
 %{_libdir}/pkgconfig/cynara-admin.pc
+
+%files -n cynara-tests
+%manifest cynara-tests.manifest
+%attr(755,root,root) /usr/bin/cynara-tests

diff --git a/packaging_tests/cynara-tests.spec b/packaging_tests/cynara-tests.spec
deleted file mode 100644 (file)
index 8b1de31..0000000
--- a/packaging_tests/cynara-tests.spec
+++ /dev/null
@@ -1,31 +0,0 @@
-Name:       cynara-tests
-Summary:    Cynara tests
-Version:    0.0.1
-Release:    1
-Group:      Development/Testing
-License:    Apache-2.0
-Source0:    %{name}-%{version}.tar.gz
-Source1001:    cynara-tests.manifest
-BuildRequires: cmake
-BuildRequires: pkgconfig(gmock)
-
-%description
-Cynara tests
-
-%global build_type %{?build_type:%build_type}%{!?build_type:RELEASE}
-
-%prep
-%setup -q
-cp -a %{SOURCE1001} .
-
-%build
-%cmake test -DCMAKE_BUILD_TYPE=%{?build_type} \
-            -DCMAKE_VERBOSE_MAKEFILE=ON
-make %{?jobs:-j%jobs}
-
-%install
-%make_install
-
-%files
-%manifest cynara-tests.manifest
-%attr(755,root,root) /usr/bin/cynara-tests

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b391a4c..820279f 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -16,47 +16,21 @@
 # @author      Aleksander Zdyb <a.zdyb@partner.samsung.com>
 # @brief       Cmake for tests
 #
-
-############################# Check minimum CMake version #####################
-
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3)
-PROJECT("cynara-tests")
-
-############################# cmake packages ##################################
-
-INCLUDE(FindPkgConfig)
-
-############################# compiler flags ##################################
-
-SET(CMAKE_C_FLAGS_DEBUG        "-g -O0 -ggdb")
-SET(CMAKE_CXX_FLAGS_DEBUG      "-g -std=c++0x -O0 -ggdb -Wp,-U_FORTIFY_SOURCE")
-SET(CMAKE_C_FLAGS_RELEASE      "-g -O2")
-SET(CMAKE_CXX_FLAGS_RELEASE    "-g -std=c++0x -O2")
-
-# Set compiler warning flags
-ADD_DEFINITIONS("-Werror")                      # Make all warnings into errors.
-ADD_DEFINITIONS("-Wall")                        # Generate all warnings
-ADD_DEFINITIONS("-Wextra")                      # Generate even more extra warnings
-ADD_DEFINITIONS("-DCYNARA_NO_LOGS")             # Disable building logs
-
-MESSAGE(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
-
-SET(TARGET_CYNARA_TESTS "cynara-tests")
-
 PKG_CHECK_MODULES(PKGS REQUIRED gmock_main)
 
-SET(CYNARA_SRC ${PROJECT_SOURCE_DIR}/../src)
+ADD_DEFINITIONS("-DCYNARA_NO_LOGS")
+SET(CYNARA_SRC ${PROJECT_SOURCE_DIR}/src)
 
 SET(CYNARA_SOURCES_FOR_TESTS
-    ${CYNARA_SRC}/service/storage/Storage.cpp
     ${CYNARA_SRC}/common/types/PolicyBucket.cpp
+    ${CYNARA_SRC}/common/types/PolicyKey.cpp
     ${CYNARA_SRC}/common/types/PolicyKeyHelpers.cpp
+    ${CYNARA_SRC}/common/types/PolicyType.cpp
+    ${CYNARA_SRC}/service/storage/Storage.cpp
     ${CYNARA_SRC}/service/storage/InMemoryStorageBackend.cpp
     ${CYNARA_SRC}/service/storage/BucketDeserializer.cpp
     ${CYNARA_SRC}/service/storage/StorageDeserializer.cpp
     ${CYNARA_SRC}/service/storage/StorageSerializer.cpp
-    ${CYNARA_SRC}/common/types/PolicyKey.cpp
-    ${CYNARA_SRC}/common/types/PolicyType.cpp
 )
 
 SET(CYNARA_TESTS_SOURCES