-# Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+#Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
SET(CLIENT_FOLDER ${PROJECT_SOURCE_DIR}/client)
SET(SERVER_FOLDER ${PROJECT_SOURCE_DIR}/server)
SET(CONTAINER_DAEMON_FOLDER ${PROJECT_SOURCE_DIR}/container-daemon)
-SET(UNIT_TESTS_FOLDER ${PROJECT_SOURCE_DIR}/unit_tests)
+SET(TESTS_FOLDER ${PROJECT_SOURCE_DIR}/tests)
+SET(UNIT_TESTS_FOLDER ${TESTS_FOLDER}/unit_tests)
IF(NOT DEFINED SYSCONF_INSTALL_DIR)
SET(SYSCONF_INSTALL_DIR "/etc")
ADD_SUBDIRECTORY(${CLIENT_FOLDER})
ADD_SUBDIRECTORY(${SERVER_FOLDER})
ADD_SUBDIRECTORY(${CONTAINER_DAEMON_FOLDER})
-ADD_SUBDIRECTORY(${UNIT_TESTS_FOLDER})
+ADD_SUBDIRECTORY(${TESTS_FOLDER})
## Test Package ################################################################
-%package unit-tests
-Summary: Security Containers Unit Tests
+%package tests
+Summary: Security Containers Tests
Group: Development/Libraries
Requires: security-containers = %{version}-%{release}
Requires: security-containers-client = %{version}-%{release}
Requires: boost-test
BuildRequires: boost-devel
-%description unit-tests
-Unit tests for both: server and client.
+%description tests
+Unit tests for both: server and client and integration tests.
-%files unit-tests
-%manifest packaging/security-containers-server-unit-tests.manifest
+%files tests
+%manifest packaging/security-containers-server-tests.manifest
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/security-containers-server-unit-tests
%attr(755,root,root) %{script_dir}/sc_all_tests.py
--- /dev/null
+#Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+# @file CMakeLists.txt
+# @author Lukasz Kostyra (l.kostyra@samsung.com)
+#
+
+ADD_SUBDIRECTORY(scripts)
+ADD_SUBDIRECTORY(unit_tests)
+
SET(SC_TEST_CONFIG_INSTALL_DIR ${SC_DATA_INSTALL_DIR}/tests)
ADD_DEFINITIONS(-DSC_TEST_CONFIG_INSTALL_DIR="${SC_TEST_CONFIG_INSTALL_DIR}")
-ADD_SUBDIRECTORY(scripts)
ADD_SUBDIRECTORY(dbus/configs)
ADD_SUBDIRECTORY(server/configs)
ADD_SUBDIRECTORY(utils/configs)