Merge branch 'tizen' into nether

Change-Id: If4fdf5a63b6f6c32276f3df577ce7905fd31fd7d

diff --combined packaging/security-tests.spec
index 8243ae7,709a3e6..ed63dd2
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -32,8 -32,6 +32,8 @@@ BuildRequires: pkgconfig(security-privi
  Requires: perf
  Requires: gdb
  Requires: diffutils
 +Requires: iproute2
 +Requires: toybox-symlinks-ping
  
  %global ckm_test_dir %{?TZ_SYS_SHARE:%TZ_SYS_SHARE/ckm-test/}%{!?TZ_SYS_SHARE:/usr/share/ckm-test/}
  %global ckm_rw_data_dir %{?TZ_SYS_DATA:%TZ_SYS_DATA/ckm/}%{!?TZ_SYS_DATA:/opt/data/ckm/}
@@@ -65,14 -63,15 +65,15 @@@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefi
          -DLOCAL_APP_DIR="%{TZ_SYS_HOME}/security_test_user/apps_rw"
  make %{?jobs:-j%jobs}
  
+ %pre
+ id -u  security_test_user 1>/dev/null 2>&1 || \
+     gum-utils -o -a --username=security_test_user --usertype=normal
+ 
  %install
  %make_install
  ln -sf /etc/smack/test_smack_rules %{buildroot}/etc/smack/test_smack_rules_lnk
  
  %post
- id -u  security_test_user 1>/dev/null 2>&1 || \
-     gum-utils -o -a --username=security_test_user --usertype=normal
- 
  # Reload dbus daemon to apply newly installed configuration
  systemctl reload dbus
  
@@@ -84,10 -83,6 +85,10 @@@ echo "security-tests postinst done ...
  /usr/bin/security-tests.sh
  /usr/bin/security-tests-all.sh
  /usr/bin/test-performance-check.sh
 +/usr/bin/setup-nether-tests-nns.sh
 +/usr/bin/teardown-nether-tests-nns.sh
 +/usr/bin/setup-nether-tests-dns.sh
 +/usr/bin/teardown-nether-tests-dns.sh
  
  /etc/dbus-1/system.d/security-tests.conf
  
@@@ -100,12 -95,11 +101,12 @@@
  /etc/smack/test_smack_rules
  /etc/smack/test_smack_rules_lnk
  %{TZ_SYS_RW_APP}*
- %{TZ_SYS_HOME}/security_test_user/apps_rw/*
+ %attr(755, security_test_user,users) %{TZ_SYS_HOME}/security_test_user/apps_rw/*
  /usr/bin/cynara-test
  /usr/bin/ckm-tests
  /usr/bin/ckm-integration-tests
  /usr/bin/yaca-test
 +/usr/bin/nether-tests
  %{ckm_test_dir}/*
  /etc/security-tests
  /usr/lib/security-tests/cynara-tests/plugins/single-policy/*

diff --combined src/nether-tests/CMakeLists.txt
index b08c24e,0000000..15e5e93
mode 100644,000000..100644
--- 1/src/nether-tests/CMakeLists.txt
--- /dev/null
+++ b/src/nether-tests/CMakeLists.txt
@@@ -1,84 -1,0 +1,78 @@@
- # Dependencies
- PKG_CHECK_MODULES(SEC_MGR_TESTS_DEP
-     REQUIRED
-     security-manager
- )
- 
 +# Copyright (c) 2017 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      Piotr Sawicki (p.sawicki2@partner.samsung.com)
 +# @brief       CMake configuration file
 +#
 +
 +INCLUDE(FindPkgConfig)
 +
-     ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/tzplatform.cpp
-     ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/sm_api.cpp
 +SET(TARGET_NETHER_TESTS "nether-tests")
 +
 +SET(NETHER_TESTS_SOURCES
 +    ${PROJECT_SOURCE_DIR}/src/nether-tests/nether_tests.cpp
 +    ${PROJECT_SOURCE_DIR}/src/common/tests_common.cpp
-     ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/sm_request.cpp
-     ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/sm_user_request.cpp
-     ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/sm_policy_request.cpp
-     ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/app_install_helper.cpp
++    ${PROJECT_SOURCE_DIR}/src/common/tzplatform.cpp
++    ${PROJECT_SOURCE_DIR}/src/common/sm_api.cpp
++    ${PROJECT_SOURCE_DIR}/src/common/sm_request.cpp
++    ${PROJECT_SOURCE_DIR}/src/common/sm_user_request.cpp
++    ${PROJECT_SOURCE_DIR}/src/common/sm_policy_request.cpp
++    ${PROJECT_SOURCE_DIR}/src/common/app_install_helper.cpp
 +    ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/sm_commons.cpp
 +    ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/policy_configuration.cpp
 +    ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/cynara_test_client.cpp
 +   )
 +
 +INCLUDE_DIRECTORIES(SYSTEM
 +    ${SEC_MGR_TESTS_DEP_INCLUDE_DIRS}
 +   )
 +
 +INCLUDE_DIRECTORIES(SYSTEM
 +    ${CYNARA_TARGET_DEP_INCLUDE_DIRS}
 +    )
 +
 +INCLUDE_DIRECTORIES(
 +    ${PROJECT_SOURCE_DIR}/src/common/
 +    ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/
 +    ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/
 +   )
 +
 +FIND_PACKAGE(Threads)
 +
 +ADD_EXECUTABLE(${TARGET_NETHER_TESTS} ${NETHER_TESTS_SOURCES})
 +
 +TARGET_LINK_LIBRARIES(${TARGET_NETHER_TESTS}
 +    ${SEC_MGR_TESTS_DEP_LIBRARIES}
 +    dpl-test-framework
 +    tests-common
 +    ${CMAKE_THREAD_LIBS_INIT}
 +    )
 +
 +INSTALL(TARGETS ${TARGET_NETHER_TESTS} DESTINATION /usr/bin)
 +
 +INSTALL(FILES
 +    ${PROJECT_SOURCE_DIR}/src/nether-tests/setup-nether-tests-nns.sh
 +    ${PROJECT_SOURCE_DIR}/src/nether-tests/teardown-nether-tests-nns.sh
 +    ${PROJECT_SOURCE_DIR}/src/nether-tests/setup-nether-tests-dns.sh
 +    ${PROJECT_SOURCE_DIR}/src/nether-tests/teardown-nether-tests-dns.sh
 +    DESTINATION bin
 +    PERMISSIONS OWNER_READ
 +                OWNER_WRITE
 +                OWNER_EXECUTE
 +                GROUP_READ
 +                GROUP_EXECUTE
 +                WORLD_READ
 +                WORLD_EXECUTE
 +    )