From 9270abea1c1062185ea6c1f7619bff5f8a53a1f1 Mon Sep 17 00:00:00 2001
From: Rafal Krypa <r.krypa@samsung.com>
Date: Tue, 6 Sep 2016 17:18:13 +0200
Subject: [PATCH] Adapt to changed TZ_SYS_RW_APP: /opt/usr/apps ->
 /opt/usr/globalapps

The path for global applications has been recently changed:
https://review.tizen.org/gerrit/85150

Make security-tests put applications files in proper location.

Change-Id: I6e3304e2f40958f0abf483d216aa12b9351b659a
---
 packaging/security-tests.spec                             | 2 +-
 src/security-manager-tests/CMakeLists.txt                 | 2 +-
 src/security-manager-tests/common/app_install_helper.h    | 2 +-
 src/security-manager-tests/common/sm_commons.cpp          | 4 ++--
 src/security-manager-tests/common/sm_commons.h            | 2 +-
 src/security-manager-tests/test_cases_trusted_sharing.cpp | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packaging/security-tests.spec b/packaging/security-tests.spec
index 27e91ba..0483592 100644
--- a/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@ -83,7 +83,7 @@ echo "security-tests postinst done ..."
 /usr/bin/security-manager-tests
 /etc/smack/test_smack_rules
 /etc/smack/test_smack_rules_lnk
-/opt/usr/apps/*
+/opt/usr/globalapps/*
 /usr/bin/cynara-test
 /usr/bin/ckm-tests
 /usr/bin/ckm-integration-tests
diff --git a/src/security-manager-tests/CMakeLists.txt b/src/security-manager-tests/CMakeLists.txt
index c052611..b6eb326 100644
--- a/src/security-manager-tests/CMakeLists.txt
+++ b/src/security-manager-tests/CMakeLists.txt
@@ -91,5 +91,5 @@ INSTALL(TARGETS ${TARGET_SEC_MGR_TESTS} DESTINATION /usr/bin)
 
 INSTALL(DIRECTORY
     ${PROJECT_SOURCE_DIR}/src/security-manager-tests/app_files/
-    DESTINATION /opt/usr/apps/
+    DESTINATION /opt/usr/globalapps/
 )
diff --git a/src/security-manager-tests/common/app_install_helper.h b/src/security-manager-tests/common/app_install_helper.h
index 0824bdb..2bd6889 100644
--- a/src/security-manager-tests/common/app_install_helper.h
+++ b/src/security-manager-tests/common/app_install_helper.h
@@ -34,7 +34,7 @@ struct AppInstallHelper {
     {}
 
     std::string getInstallDir() const {
-        return "/opt/usr/apps/" + getPkgId();
+        return "/opt/usr/globalapps/" + getPkgId();
     }
 
     std::string getTrustedDir(int i = 0) const {
diff --git a/src/security-manager-tests/common/sm_commons.cpp b/src/security-manager-tests/common/sm_commons.cpp
index 132d55e..71aeb89 100644
--- a/src/security-manager-tests/common/sm_commons.cpp
+++ b/src/security-manager-tests/common/sm_commons.cpp
@@ -78,7 +78,7 @@ std::string generatePkgLabel(const std::string &pkgId)
 static std::string genPath(int app_num, const char *postfix) {
     char buf[16];
     sprintf(buf, "%02d", app_num);
-    return std::string("/opt/usr/apps/sm_test_") + std::string(buf) + std::string("_pkg_id_full/") + std::string(postfix);
+    return std::string("/opt/usr/globalapps/sm_test_") + std::string(buf) + std::string("_pkg_id_full/") + std::string(postfix);
 }
 
 std::string genRWPath(int app_num) {
@@ -210,7 +210,7 @@ int nftw_remove_labels(const char *fpath, const struct stat* /*sb*/,
     return 0;
 }
 
-static const char *const SM_DENIED_PATH = "/opt/usr/apps/non_app_dir";
+static const char *const SM_DENIED_PATH = "/opt/usr/globalapps/non_app_dir";
 
 void check_app_permissions(const char *const app_id, const char *const pkg_id,
                            const char *const user, const privileges_t &allowed_privs,
diff --git a/src/security-manager-tests/common/sm_commons.h b/src/security-manager-tests/common/sm_commons.h
index ec0210b..e9a6892 100644
--- a/src/security-manager-tests/common/sm_commons.h
+++ b/src/security-manager-tests/common/sm_commons.h
@@ -43,7 +43,7 @@ extern const privileges_t SM_ALLOWED_PRIVILEGES;
 extern const privileges_t SM_DENIED_PRIVILEGES;
 extern const privileges_t SM_NO_PRIVILEGES;
 extern const std::vector<std::string> SM_ALLOWED_GROUPS;
-static const char *const SM_RW_PATH = "/opt/usr/apps/sm_test_02_pkg_id_full/app_dir";
+static const char *const SM_RW_PATH = "/opt/usr/globalapps/sm_test_02_pkg_id_full/app_dir";
 
 const std::string uidToStr(const uid_t uid);
 
diff --git a/src/security-manager-tests/test_cases_trusted_sharing.cpp b/src/security-manager-tests/test_cases_trusted_sharing.cpp
index 46dfe69..f2ed2f6 100644
--- a/src/security-manager-tests/test_cases_trusted_sharing.cpp
+++ b/src/security-manager-tests/test_cases_trusted_sharing.cpp
@@ -32,7 +32,7 @@
 
 using namespace SecurityManagerTest;
 
-static const char *const SM_TRUSTED_PATH = "/opt/usr/apps/sm_test_02_pkg_id_full/app_dir_trusted";
+static const char *const SM_TRUSTED_PATH = "/opt/usr/globalapps/sm_test_02_pkg_id_full/app_dir_trusted";
 
 static void check_exact_access(const std::string& subject, const std::string& object, const std::string& access)
 {
-- 
2.7.4