From 66a2909555ec2d96fa63146ed83fab8b987a275f Mon Sep 17 00:00:00 2001 From: Zofia Abramowska Date: Thu, 7 Sep 2017 17:01:49 +0200 Subject: [PATCH] Move scoped installer to global commons Change-Id: I9effa1a4cb6669f591d8d6ab7d2c39a1e6a7ba32 --- src/common/CMakeLists.txt | 9 +++++++++ .../common/app_def_privilege.h | 0 .../common/app_install_helper.cpp | 0 .../common/app_install_helper.h | 0 src/{security-manager-tests => }/common/sm_api.cpp | 0 src/{security-manager-tests => }/common/sm_api.h | 0 .../common/sm_label_monitor.cpp | 0 .../common/sm_label_monitor.h | 0 .../common/sm_policy_request.cpp | 0 .../common/sm_policy_request.h | 0 src/{security-manager-tests => }/common/sm_request.cpp | 0 src/{security-manager-tests => }/common/sm_request.h | 0 .../common/sm_sharing_request.cpp | 0 .../common/sm_sharing_request.h | 0 .../common/sm_user_request.cpp | 0 .../common/sm_user_request.h | 0 src/{security-manager-tests => }/common/tzplatform.cpp | 0 src/{security-manager-tests => }/common/tzplatform.h | 0 src/security-manager-tests/CMakeLists.txt | 8 -------- 19 files changed, 9 insertions(+), 8 deletions(-) rename src/{security-manager-tests => }/common/app_def_privilege.h (100%) rename src/{security-manager-tests => }/common/app_install_helper.cpp (100%) rename src/{security-manager-tests => }/common/app_install_helper.h (100%) rename src/{security-manager-tests => }/common/sm_api.cpp (100%) rename src/{security-manager-tests => }/common/sm_api.h (100%) rename src/{security-manager-tests => }/common/sm_label_monitor.cpp (100%) rename src/{security-manager-tests => }/common/sm_label_monitor.h (100%) rename src/{security-manager-tests => }/common/sm_policy_request.cpp (100%) rename src/{security-manager-tests => }/common/sm_policy_request.h (100%) rename src/{security-manager-tests => }/common/sm_request.cpp (100%) rename src/{security-manager-tests => }/common/sm_request.h (100%) rename src/{security-manager-tests => }/common/sm_sharing_request.cpp (100%) rename src/{security-manager-tests => }/common/sm_sharing_request.h (100%) rename src/{security-manager-tests => }/common/sm_user_request.cpp (100%) rename src/{security-manager-tests => }/common/sm_user_request.h (100%) rename src/{security-manager-tests => }/common/tzplatform.cpp (100%) rename src/{security-manager-tests => }/common/tzplatform.h (100%) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index cfb01ee7..0bfeb9bb 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -11,6 +11,7 @@ PKG_CHECK_MODULES(COMMON_TARGET_DEP cynara-creds-socket cynara-creds-dbus cynara-creds-gdbus + security-manager REQUIRED ) @@ -34,6 +35,14 @@ SET(COMMON_TARGET_TEST_SOURCES ${PROJECT_SOURCE_DIR}/src/common/temp_test_user.cpp ${PROJECT_SOURCE_DIR}/src/common/cynara_helpers_creds.cpp ${PROJECT_SOURCE_DIR}/src/common/label_generator.cpp + ${PROJECT_SOURCE_DIR}/src/common/app_install_helper.cpp + ${PROJECT_SOURCE_DIR}/src/common/sm_api.cpp + ${PROJECT_SOURCE_DIR}/src/common/sm_label_monitor.cpp + ${PROJECT_SOURCE_DIR}/src/common/sm_request.cpp + ${PROJECT_SOURCE_DIR}/src/common/sm_sharing_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/tzplatform.cpp ) #system and local includes diff --git a/src/security-manager-tests/common/app_def_privilege.h b/src/common/app_def_privilege.h similarity index 100% rename from src/security-manager-tests/common/app_def_privilege.h rename to src/common/app_def_privilege.h diff --git a/src/security-manager-tests/common/app_install_helper.cpp b/src/common/app_install_helper.cpp similarity index 100% rename from src/security-manager-tests/common/app_install_helper.cpp rename to src/common/app_install_helper.cpp diff --git a/src/security-manager-tests/common/app_install_helper.h b/src/common/app_install_helper.h similarity index 100% rename from src/security-manager-tests/common/app_install_helper.h rename to src/common/app_install_helper.h diff --git a/src/security-manager-tests/common/sm_api.cpp b/src/common/sm_api.cpp similarity index 100% rename from src/security-manager-tests/common/sm_api.cpp rename to src/common/sm_api.cpp diff --git a/src/security-manager-tests/common/sm_api.h b/src/common/sm_api.h similarity index 100% rename from src/security-manager-tests/common/sm_api.h rename to src/common/sm_api.h diff --git a/src/security-manager-tests/common/sm_label_monitor.cpp b/src/common/sm_label_monitor.cpp similarity index 100% rename from src/security-manager-tests/common/sm_label_monitor.cpp rename to src/common/sm_label_monitor.cpp diff --git a/src/security-manager-tests/common/sm_label_monitor.h b/src/common/sm_label_monitor.h similarity index 100% rename from src/security-manager-tests/common/sm_label_monitor.h rename to src/common/sm_label_monitor.h diff --git a/src/security-manager-tests/common/sm_policy_request.cpp b/src/common/sm_policy_request.cpp similarity index 100% rename from src/security-manager-tests/common/sm_policy_request.cpp rename to src/common/sm_policy_request.cpp diff --git a/src/security-manager-tests/common/sm_policy_request.h b/src/common/sm_policy_request.h similarity index 100% rename from src/security-manager-tests/common/sm_policy_request.h rename to src/common/sm_policy_request.h diff --git a/src/security-manager-tests/common/sm_request.cpp b/src/common/sm_request.cpp similarity index 100% rename from src/security-manager-tests/common/sm_request.cpp rename to src/common/sm_request.cpp diff --git a/src/security-manager-tests/common/sm_request.h b/src/common/sm_request.h similarity index 100% rename from src/security-manager-tests/common/sm_request.h rename to src/common/sm_request.h diff --git a/src/security-manager-tests/common/sm_sharing_request.cpp b/src/common/sm_sharing_request.cpp similarity index 100% rename from src/security-manager-tests/common/sm_sharing_request.cpp rename to src/common/sm_sharing_request.cpp diff --git a/src/security-manager-tests/common/sm_sharing_request.h b/src/common/sm_sharing_request.h similarity index 100% rename from src/security-manager-tests/common/sm_sharing_request.h rename to src/common/sm_sharing_request.h diff --git a/src/security-manager-tests/common/sm_user_request.cpp b/src/common/sm_user_request.cpp similarity index 100% rename from src/security-manager-tests/common/sm_user_request.cpp rename to src/common/sm_user_request.cpp diff --git a/src/security-manager-tests/common/sm_user_request.h b/src/common/sm_user_request.h similarity index 100% rename from src/security-manager-tests/common/sm_user_request.h rename to src/common/sm_user_request.h diff --git a/src/security-manager-tests/common/tzplatform.cpp b/src/common/tzplatform.cpp similarity index 100% rename from src/security-manager-tests/common/tzplatform.cpp rename to src/common/tzplatform.cpp diff --git a/src/security-manager-tests/common/tzplatform.h b/src/common/tzplatform.h similarity index 100% rename from src/security-manager-tests/common/tzplatform.h rename to src/common/tzplatform.h diff --git a/src/security-manager-tests/CMakeLists.txt b/src/security-manager-tests/CMakeLists.txt index 54c7ae40..9d9bcf81 100644 --- a/src/security-manager-tests/CMakeLists.txt +++ b/src/security-manager-tests/CMakeLists.txt @@ -54,16 +54,8 @@ SET(SEC_MGR_SOURCES ${PROJECT_SOURCE_DIR}/src/security-manager-tests/test_cases_trusted_sharing.cpp ${PROJECT_SOURCE_DIR}/src/security-manager-tests/test_cases_prepare_app.cpp ${PROJECT_SOURCE_DIR}/src/security-manager-tests/security_manager_tests.cpp - ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/app_install_helper.cpp ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/policy_configuration.cpp - ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/sm_api.cpp ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/sm_commons.cpp - ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/sm_label_monitor.cpp - ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/sm_request.cpp - ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/sm_sharing_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/tzplatform.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 -- 2.34.1