Merge branch 'tizen' into security-manager 05/38605/2
authorPawel Wieczorek <p.wieczorek2@samsung.com>
Wed, 22 Apr 2015 15:01:20 +0000 (17:01 +0200)
committerPawel Wieczorek <p.wieczorek2@samsung.com>
Wed, 22 Apr 2015 15:24:59 +0000 (08:24 -0700)
Conflicts:
packaging/security-tests.spec
src/security-manager-tests/CMakeLists.txt
src/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/exec
src/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/normal
src/security-manager-tests/test_DIR/app_dir/.level_1/exec
src/security-manager-tests/test_DIR/app_dir/.level_1/level_2/exec
src/security-manager-tests/test_DIR/app_dir/.level_1/level_2/normal
src/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_exec
src/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_normal
src/security-manager-tests/test_DIR/app_dir/.level_1/normal
src/security-manager-tests/test_DIR/app_dir/exec
src/security-manager-tests/test_DIR/app_dir/level_1/.level_2/exec
src/security-manager-tests/test_DIR/app_dir/level_1/.level_2/normal
src/security-manager-tests/test_DIR/app_dir/level_1/exec
src/security-manager-tests/test_DIR/app_dir/level_1/level_2/exec
src/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_exec
src/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_non_exec
src/security-manager-tests/test_DIR/app_dir/level_1/level_2/normal
src/security-manager-tests/test_DIR/app_dir/level_1/link_to_exec
src/security-manager-tests/test_DIR/app_dir/level_1/link_to_non_exec
src/security-manager-tests/test_DIR/app_dir/level_1/normal
src/security-manager-tests/test_DIR/app_dir/link_to_exec
src/security-manager-tests/test_DIR/app_dir/link_to_non_app_dir
src/security-manager-tests/test_DIR/app_dir/link_to_non_app_exec
src/security-manager-tests/test_DIR/app_dir/link_to_non_app_normal
src/security-manager-tests/test_DIR/app_dir/link_to_non_exec
src/security-manager-tests/test_DIR/app_dir/normal
src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/exec
src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/normal
src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/exec
src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/exec
src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/normal
src/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/normal
src/security-manager-tests/test_DIR/app_dir_public_ro/exec
src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/exec
src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/normal
src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/exec
src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/exec
src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_exec
src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_non_exec
src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/normal
src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_exec
src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_non_exec
src/security-manager-tests/test_DIR/app_dir_public_ro/level_1/normal
src/security-manager-tests/test_DIR/app_dir_public_ro/link_to_exec
src/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_dir
src/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_exec
src/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_normal
src/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_exec
src/security-manager-tests/test_DIR/app_dir_public_ro/normal
src/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/exec
src/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/normal
src/security-manager-tests/test_DIR/non_app_dir/.level_1/exec
src/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/exec
src/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/normal
src/security-manager-tests/test_DIR/non_app_dir/.level_1/normal
src/security-manager-tests/test_DIR/non_app_dir/exec
src/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/exec
src/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/normal
src/security-manager-tests/test_DIR/non_app_dir/level_1/exec
src/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/exec
src/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_exec
src/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_non_exec
src/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/normal
src/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_exec
src/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_non_exec
src/security-manager-tests/test_DIR/non_app_dir/level_1/normal
src/security-manager-tests/test_DIR/non_app_dir/link_to_exec
src/security-manager-tests/test_DIR/non_app_dir/link_to_non_exec
src/security-manager-tests/test_DIR/non_app_dir/normal
tests/common/CMakeLists.txt
tests/security-manager-tests/apps_rw/app_dir/.level_1/.level_2/exec
tests/security-manager-tests/apps_rw/app_dir/.level_1/.level_2/normal
tests/security-manager-tests/apps_rw/app_dir/.level_1/exec
tests/security-manager-tests/apps_rw/app_dir/.level_1/level_2/exec
tests/security-manager-tests/apps_rw/app_dir/.level_1/level_2/normal
tests/security-manager-tests/apps_rw/app_dir/.level_1/link_to_non_app_exec
tests/security-manager-tests/apps_rw/app_dir/.level_1/link_to_non_app_normal
tests/security-manager-tests/apps_rw/app_dir/.level_1/normal
tests/security-manager-tests/apps_rw/app_dir/exec
tests/security-manager-tests/apps_rw/app_dir/level_1/.level_2/exec
tests/security-manager-tests/apps_rw/app_dir/level_1/.level_2/normal
tests/security-manager-tests/apps_rw/app_dir/level_1/exec
tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/exec
tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/link_to_exec
tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/link_to_non_exec
tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/normal
tests/security-manager-tests/apps_rw/app_dir/level_1/link_to_exec
tests/security-manager-tests/apps_rw/app_dir/level_1/link_to_non_exec
tests/security-manager-tests/apps_rw/app_dir/level_1/normal
tests/security-manager-tests/apps_rw/app_dir/link_to_exec
tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_dir
tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_exec
tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_normal
tests/security-manager-tests/apps_rw/app_dir/link_to_non_exec
tests/security-manager-tests/apps_rw/app_dir/normal
tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/.level_2/exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/.level_2/normal
tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/level_2/exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/level_2/normal
tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/normal
tests/security-manager-tests/apps_rw/app_dir_public_ro/exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/.level_2/exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/.level_2/normal
tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/link_to_exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/link_to_non_exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/normal
tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/link_to_exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/link_to_non_exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/normal
tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_dir
tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_normal
tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_exec
tests/security-manager-tests/apps_rw/app_dir_public_ro/normal
tests/security-manager-tests/apps_rw/non_app_dir/.level_1/.level_2/exec
tests/security-manager-tests/apps_rw/non_app_dir/.level_1/.level_2/normal
tests/security-manager-tests/apps_rw/non_app_dir/.level_1/exec
tests/security-manager-tests/apps_rw/non_app_dir/.level_1/level_2/exec
tests/security-manager-tests/apps_rw/non_app_dir/.level_1/level_2/normal
tests/security-manager-tests/apps_rw/non_app_dir/.level_1/normal
tests/security-manager-tests/apps_rw/non_app_dir/exec
tests/security-manager-tests/apps_rw/non_app_dir/level_1/.level_2/exec
tests/security-manager-tests/apps_rw/non_app_dir/level_1/.level_2/normal
tests/security-manager-tests/apps_rw/non_app_dir/level_1/exec
tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/exec
tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/link_to_exec
tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/link_to_non_exec
tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/normal
tests/security-manager-tests/apps_rw/non_app_dir/level_1/link_to_exec
tests/security-manager-tests/apps_rw/non_app_dir/level_1/link_to_non_exec
tests/security-manager-tests/apps_rw/non_app_dir/level_1/normal
tests/security-manager-tests/apps_rw/non_app_dir/link_to_exec
tests/security-manager-tests/apps_rw/non_app_dir/link_to_non_exec
tests/security-manager-tests/apps_rw/non_app_dir/normal
tests/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/exec
tests/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/normal
tests/security-manager-tests/test_DIR/app_dir/.level_1/exec
tests/security-manager-tests/test_DIR/app_dir/.level_1/level_2/exec
tests/security-manager-tests/test_DIR/app_dir/.level_1/level_2/normal
tests/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_exec
tests/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_normal
tests/security-manager-tests/test_DIR/app_dir/.level_1/normal
tests/security-manager-tests/test_DIR/app_dir/exec
tests/security-manager-tests/test_DIR/app_dir/level_1/.level_2/exec
tests/security-manager-tests/test_DIR/app_dir/level_1/.level_2/normal
tests/security-manager-tests/test_DIR/app_dir/level_1/exec
tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/exec
tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_exec
tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_non_exec
tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/normal
tests/security-manager-tests/test_DIR/app_dir/level_1/link_to_exec
tests/security-manager-tests/test_DIR/app_dir/level_1/link_to_non_exec
tests/security-manager-tests/test_DIR/app_dir/level_1/normal
tests/security-manager-tests/test_DIR/app_dir/link_to_exec
tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_dir
tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_exec
tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_normal
tests/security-manager-tests/test_DIR/app_dir/link_to_non_exec
tests/security-manager-tests/test_DIR/app_dir/normal
tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/normal
tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/normal
tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/normal
tests/security-manager-tests/test_DIR/app_dir_public_ro/exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/normal
tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_non_exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/normal
tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_non_exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/normal
tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_dir
tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_normal
tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_exec
tests/security-manager-tests/test_DIR/app_dir_public_ro/normal
tests/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/exec
tests/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/normal
tests/security-manager-tests/test_DIR/non_app_dir/.level_1/exec
tests/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/exec
tests/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/normal
tests/security-manager-tests/test_DIR/non_app_dir/.level_1/normal
tests/security-manager-tests/test_DIR/non_app_dir/exec
tests/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/exec
tests/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/normal
tests/security-manager-tests/test_DIR/non_app_dir/level_1/exec
tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/exec
tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_exec
tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_non_exec
tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/normal
tests/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_exec
tests/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_non_exec
tests/security-manager-tests/test_DIR/non_app_dir/level_1/normal
tests/security-manager-tests/test_DIR/non_app_dir/link_to_exec
tests/security-manager-tests/test_DIR/non_app_dir/link_to_non_exec
tests/security-manager-tests/test_DIR/non_app_dir/normal

Change-Id: If7b091f075dd360826c7194e94443a35adf27b1e
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
86 files changed:
1  2 
packaging/security-tests.spec
src/common/CMakeLists.txt
src/common/temp_test_user.cpp
src/common/temp_test_user.h
src/common/tests_common.cpp
src/common/tests_common.h
src/security-manager-tests/CMakeLists.txt
src/security-manager-tests/apps_rw/app_dir/.level_1/.level_2/exec
src/security-manager-tests/apps_rw/app_dir/.level_1/.level_2/normal
src/security-manager-tests/apps_rw/app_dir/.level_1/exec
src/security-manager-tests/apps_rw/app_dir/.level_1/level_2/exec
src/security-manager-tests/apps_rw/app_dir/.level_1/level_2/normal
src/security-manager-tests/apps_rw/app_dir/.level_1/link_to_non_app_exec
src/security-manager-tests/apps_rw/app_dir/.level_1/link_to_non_app_normal
src/security-manager-tests/apps_rw/app_dir/.level_1/normal
src/security-manager-tests/apps_rw/app_dir/exec
src/security-manager-tests/apps_rw/app_dir/level_1/.level_2/exec
src/security-manager-tests/apps_rw/app_dir/level_1/.level_2/normal
src/security-manager-tests/apps_rw/app_dir/level_1/exec
src/security-manager-tests/apps_rw/app_dir/level_1/level_2/exec
src/security-manager-tests/apps_rw/app_dir/level_1/level_2/link_to_exec
src/security-manager-tests/apps_rw/app_dir/level_1/level_2/link_to_non_exec
src/security-manager-tests/apps_rw/app_dir/level_1/level_2/normal
src/security-manager-tests/apps_rw/app_dir/level_1/link_to_exec
src/security-manager-tests/apps_rw/app_dir/level_1/link_to_non_exec
src/security-manager-tests/apps_rw/app_dir/level_1/normal
src/security-manager-tests/apps_rw/app_dir/link_to_exec
src/security-manager-tests/apps_rw/app_dir/link_to_non_app_dir
src/security-manager-tests/apps_rw/app_dir/link_to_non_app_exec
src/security-manager-tests/apps_rw/app_dir/link_to_non_app_normal
src/security-manager-tests/apps_rw/app_dir/link_to_non_exec
src/security-manager-tests/apps_rw/app_dir/normal
src/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/.level_2/exec
src/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/.level_2/normal
src/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/exec
src/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/level_2/exec
src/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/level_2/normal
src/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/normal
src/security-manager-tests/apps_rw/app_dir_public_ro/exec
src/security-manager-tests/apps_rw/app_dir_public_ro/level_1/.level_2/exec
src/security-manager-tests/apps_rw/app_dir_public_ro/level_1/.level_2/normal
src/security-manager-tests/apps_rw/app_dir_public_ro/level_1/exec
src/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/exec
src/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/link_to_exec
src/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/link_to_non_exec
src/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/normal
src/security-manager-tests/apps_rw/app_dir_public_ro/level_1/link_to_exec
src/security-manager-tests/apps_rw/app_dir_public_ro/level_1/link_to_non_exec
src/security-manager-tests/apps_rw/app_dir_public_ro/level_1/normal
src/security-manager-tests/apps_rw/app_dir_public_ro/link_to_exec
src/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_dir
src/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_exec
src/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_normal
src/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_exec
src/security-manager-tests/apps_rw/app_dir_public_ro/normal
src/security-manager-tests/apps_rw/non_app_dir/.level_1/.level_2/exec
src/security-manager-tests/apps_rw/non_app_dir/.level_1/.level_2/normal
src/security-manager-tests/apps_rw/non_app_dir/.level_1/exec
src/security-manager-tests/apps_rw/non_app_dir/.level_1/level_2/exec
src/security-manager-tests/apps_rw/non_app_dir/.level_1/level_2/normal
src/security-manager-tests/apps_rw/non_app_dir/.level_1/normal
src/security-manager-tests/apps_rw/non_app_dir/exec
src/security-manager-tests/apps_rw/non_app_dir/level_1/.level_2/exec
src/security-manager-tests/apps_rw/non_app_dir/level_1/.level_2/normal
src/security-manager-tests/apps_rw/non_app_dir/level_1/exec
src/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/exec
src/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/link_to_exec
src/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/link_to_non_exec
src/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/normal
src/security-manager-tests/apps_rw/non_app_dir/level_1/link_to_exec
src/security-manager-tests/apps_rw/non_app_dir/level_1/link_to_non_exec
src/security-manager-tests/apps_rw/non_app_dir/level_1/normal
src/security-manager-tests/apps_rw/non_app_dir/link_to_exec
src/security-manager-tests/apps_rw/non_app_dir/link_to_non_exec
src/security-manager-tests/apps_rw/non_app_dir/normal
src/security-manager-tests/apps_rw/subdir/file
src/security-manager-tests/common/sm_api.cpp
src/security-manager-tests/common/sm_api.h
src/security-manager-tests/common/sm_db.cpp
src/security-manager-tests/common/sm_policy_request.cpp
src/security-manager-tests/common/sm_policy_request.h
src/security-manager-tests/common/sm_request.cpp
src/security-manager-tests/common/sm_request.h
src/security-manager-tests/common/sm_user_request.cpp
src/security-manager-tests/common/sm_user_request.h
src/security-manager-tests/security_manager_tests.cpp

@@@ -25,9 -25,13 +25,11 @@@ BuildRequires: pkgconfig(sqlite3
  BuildRequires: cynara-devel
  BuildRequires: pkgconfig(libtzplatform-config)
  BuildRequires: boost-devel
 -Requires(post): gum-utils
 -Requires(postun): gum-utils
 -Requires(postun): %{_bindir}/id
+ BuildRequires: pkgconfig(vconf)
 +BuildRequires: pkgconfig(libgum) >= 1.0.5
  Requires: perf
  Requires: gdb
+ Requires: key-manager-listener
  
  %description
  Security tests repository - for tests that can't be kept together with code.
@@@ -43,8 -47,12 +45,11 @@@ 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
 +        -DCYNARA_DB_DIR=%{_localstatedir}/cynara/db
  make %{?jobs:-j%jobs}
  
  %install
@@@ -58,8 -68,17 +63,14 @@@ find /usr/apps/ -type f -name exec -exe
  # Load permissions templates
  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
 -%{_bindir}/gum-utils --delete-user --uid=`%{_bindir}/id -u security-tests-app` --offline
 -
  %files
  %manifest %{name}.manifest
  %defattr(-, root, root, -)
index 0000000,fcfc13f..994fee1
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,44 +1,48 @@@
+ INCLUDE(FindPkgConfig)
++SET(COMMON_TARGET_TEST "tests-common")
+ #dependencies
+ PKG_CHECK_MODULES(COMMON_TARGET_DEP
+     libsmack
+     dbus-1
+     sqlite3
++    libgum
++    glib-2.0
+     REQUIRED
+     )
+ #files to compile
+ SET(COMMON_TARGET_TEST_SOURCES
+     ${PROJECT_SOURCE_DIR}/src/common/tests_common.cpp
+     ${PROJECT_SOURCE_DIR}/src/common/access_provider.cpp
+     ${PROJECT_SOURCE_DIR}/src/common/smack_access.cpp
+     ${PROJECT_SOURCE_DIR}/src/common/dbus_connection.cpp
+     ${PROJECT_SOURCE_DIR}/src/common/dbus_message_in.cpp
+     ${PROJECT_SOURCE_DIR}/src/common/dbus_message_out.cpp
+     ${PROJECT_SOURCE_DIR}/src/common/service_manager.cpp
+     ${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
++    ${PROJECT_SOURCE_DIR}/src/common/temp_test_user.cpp
+     )
+ #system and local includes
+ INCLUDE_DIRECTORIES(SYSTEM ${COMMON_TARGET_DEP_INCLUDE_DIRS})
+ INCLUDE_DIRECTORIES(
+     ${PROJECT_SOURCE_DIR}/src/framework/include
+     ${PROJECT_SOURCE_DIR}/src/common
+     )
+ #output OBJECT format
+ ADD_LIBRARY(${COMMON_TARGET_TEST} ${COMMON_TARGET_TEST_SOURCES})
+ TARGET_LINK_LIBRARIES(${COMMON_TARGET_TEST} ${COMMON_TARGET_DEP_LIBRARIES}
+     dpl-test-framework)
+ INSTALL (FILES ${PROJECT_SOURCE_DIR}/src/common/security-tests.conf DESTINATION /etc/dbus-1/system.d)
index f6aa6c1,0000000..f6aa6c1
mode 100644,000000..100644
--- /dev/null
index 120b21b,0000000..120b21b
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
@@@ -30,25 -28,16 +29,24 @@@ PKG_CHECK_MODULES(SEC_MGR_TESTS_DE
      security-manager
      libtzplatform-config
      sqlite3
 -    libcap)
 +    libcap
 +    dbus-1
-     libgum
-     cynara-admin)
++    libgum)
  
  
  SET(TARGET_SEC_MGR_TESTS "security-manager-tests")
  
  SET(SEC_MGR_SOURCES
-     ${PROJECT_SOURCE_DIR}/tests/security-manager-tests/security_manager_tests.cpp
-     ${PROJECT_SOURCE_DIR}/tests/security-manager-tests/common/sm_api.cpp
-     ${PROJECT_SOURCE_DIR}/tests/security-manager-tests/common/sm_db.cpp
-     ${PROJECT_SOURCE_DIR}/tests/security-manager-tests/common/sm_request.cpp
-     ${PROJECT_SOURCE_DIR}/tests/security-manager-tests/common/sm_user_request.cpp
-     ${PROJECT_SOURCE_DIR}/tests/security-manager-tests/common/sm_policy_request.cpp
-     ${PROJECT_SOURCE_DIR}/tests/cynara-tests/common/cynara_test_client.cpp
-     ${PROJECT_SOURCE_DIR}/tests/cynara-tests/common/cynara_test_admin.cpp
-     ${PROJECT_SOURCE_DIR}/tests/cynara-tests/plugins/plugins.cpp
-     ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/libprivilege-control_test_common.cpp
+     ${PROJECT_SOURCE_DIR}/src/security-manager-tests/security_manager_tests.cpp
++    ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/sm_api.cpp
+     ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/sm_db.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/cynara-tests/common/cynara_test_client.cpp
++    ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/cynara_test_admin.cpp
++    ${PROJECT_SOURCE_DIR}/src/cynara-tests/plugins/plugins.cpp
+     ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/libprivilege-control_test_common.cpp
     )
  
  INCLUDE_DIRECTORIES(SYSTEM
@@@ -60,15 -49,12 +58,15 @@@ INCLUDE_DIRECTORIES(SYSTE
      )
  
  INCLUDE_DIRECTORIES(
-     ${PROJECT_SOURCE_DIR}/tests/common/
-     ${PROJECT_SOURCE_DIR}/tests/security-manager-tests/common/
-     ${PROJECT_SOURCE_DIR}/tests/cynara-tests/common/
-     ${PROJECT_SOURCE_DIR}/tests/cynara-tests/plugins/
-     ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/common/
+     ${PROJECT_SOURCE_DIR}/src/common/
+     ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/
+     ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/
++    ${PROJECT_SOURCE_DIR}/src/cynara-tests/plugins/
+     ${PROJECT_SOURCE_DIR}/src/libprivilege-control-tests/common/
     )
  
 +FIND_PACKAGE(Threads)
 +
  ADD_EXECUTABLE(${TARGET_SEC_MGR_TESTS} ${SEC_MGR_SOURCES})
  
  TARGET_LINK_LIBRARIES(${TARGET_SEC_MGR_TESTS}
  INSTALL(TARGETS ${TARGET_SEC_MGR_TESTS} DESTINATION /usr/bin)
  
  INSTALL(DIRECTORY
-     ${PROJECT_SOURCE_DIR}/tests/security-manager-tests/apps_rw/
 -    ${PROJECT_SOURCE_DIR}/src/security-manager-tests/test_DIR
++    ${PROJECT_SOURCE_DIR}/src/security-manager-tests/apps_rw/
      DESTINATION /usr/apps/
  )
 -
 -INSTALL(DIRECTORY
 -    ${PROJECT_SOURCE_DIR}/src/security-manager-tests/test_DIR
 -    DESTINATION /home/${APP_USER}/
 -)