Merging tizen into ckm. Stage 3.

Merged remote-tracking branch 'tizen.org/tizen' into ckm

Change-Id: Iffa2e26113f653cf4c6f685bc7e4dc7d25472ae5

diff --combined CMakeLists.txt
index 99f65e4,e6e0572..8b76681
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -80,9 -80,9 +80,10 @@@ ENDIF(SMACK_ENABLE
  
  ############################# Targets names ###################################
  
 -# No target defined so far
 +SET(TARGET_CKM_TESTS "ckm-tests")
 +SET(COMMON_TARGET_TEST "tests-common")
  
  ############################# subdirectories ##################################
  
  ADD_SUBDIRECTORY(src)
+ ADD_SUBDIRECTORY(tests)

diff --combined packaging/security-tests.spec
index 8b561ac,c4de72e..fac0fe8
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -25,7 -25,6 +25,7 @@@ BuildRequires: pkgconfig(sqlite3
  BuildRequires: cynara-devel
  BuildRequires: pkgconfig(libtzplatform-config)
  BuildRequires: boost-devel
 +BuildRequires: pkgconfig(vconf)
  Requires(post): gum-utils
  Requires(postun): gum-utils
  Requires(postun): %{_bindir}/id
@@@ -46,9 -45,6 +46,9 @@@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefi
          -DDPL_LOG="ON"                    \
          -DVERSION=%{version}              \
          -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}%{!?build_type:DEBUG} \
 +%if "%{sec_product_feature_security_mdfpp_enable}" == "1"
 +        -DSECURITY_MDFPP_STATE_ENABLE=1 \
 +%endif
          -DCMAKE_VERBOSE_MAKEFILE=ON       \
          -DCYNARA_DB_DIR=%{_localstatedir}/cynara/db \
          -DAPP_USER=security-tests-app
@@@ -59,20 -55,14 +59,20 @@@ make %{?jobs:-j%jobs
  ln -sf /etc/smack/test_smack_rules %{buildroot}/etc/smack/test_smack_rules_lnk
  
  %post
- %{_bindir}/gum-utils --add-user --username=security-tests-app --usertype=4 --offline
+ %{_bindir}/gum-utils --add-user --username=security-tests-app --usertype=normal --offline
  
  find /etc/smack/test_privilege_control_DIR/ -type f -name exec -exec chmod 0755 {} +
  find /usr/apps/test_DIR/ -type f -name exec -exec chmod 0755 {} +
  
  # Load permissions templates
- api_feature_loader --verbose --clear-permissions
+ api_feature_loader --verbose
  
 +# Set vconf key for cc-mode testing if vconf key isn't there.
 +%if "%{sec_product_feature_security_mdfpp_enable}" != "1"
 +    echo "Install vconf key (file/security_mdpp/security_mdpp_state) for testing key-manager"
 +    vconftool set -t string file/security_mdpp/security_mdpp_state "Unset"
 +%endif
 +
  echo "security-tests postinst done ..."
  
  %postun
@@@ -118,3 -108,4 +118,4 @@@
  /usr/lib/security-tests/cynara-tests/plugins/single-policy/*
  /usr/lib/security-tests/cynara-tests/plugins/multiple-policy/*
  /usr/lib/security-tests/cynara-tests/plugins/test-agent/*
+ /usr/bin/security-tests-inner-test

diff --combined src/common/CMakeLists.txt
index 11a444f,abd3aa6..fcfc13f
--- 1/src/common/CMakeLists.txt
--- 2/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@@ -1,4 -1,5 +1,4 @@@
  INCLUDE(FindPkgConfig)
 -SET(COMMON_TARGET_TEST "tests-common")
  
  #dependencies
  PKG_CHECK_MODULES(COMMON_TARGET_DEP
@@@ -20,6 -21,10 +20,10 @@@ SET(COMMON_TARGET_TEST_SOURCE
      ${PROJECT_SOURCE_DIR}/src/common/memory.cpp
      ${PROJECT_SOURCE_DIR}/src/common/db_sqlite.cpp
      ${PROJECT_SOURCE_DIR}/src/common/fs_label_manager.cpp
+     ${PROJECT_SOURCE_DIR}/src/common/passwd_access.cpp
+     ${PROJECT_SOURCE_DIR}/src/common/uds.cpp
+     ${PROJECT_SOURCE_DIR}/src/common/synchronization_pipe.cpp
+     ${PROJECT_SOURCE_DIR}/src/common/timeout.cpp
      )
  
  #system and local includes