SM : Add transmute and exec params to check_path

Change-Id: Ie779b3e36bc815cd2c2dc46b0c9cd0ab50be9428

diff --git a/src/security-manager-tests/common/sm_commons.cpp b/src/security-manager-tests/common/sm_commons.cpp
index 55dd522e61429a16d043eb851efc7cb459487804..f261ceb8957934f8e8bb649d714b56d6aec9f078 100644 (file)
--- a/src/security-manager-tests/common/sm_commons.cpp
+++ b/src/security-manager-tests/common/sm_commons.cpp
@@ -314,10 +314,10 @@ void check_app_after_install(const std::string &app_id, const std::string &pkg_i
     check_app_gids(app_id, allowed_gids);
 }
 
-void check_path(const std::string &path, const std::string &label) {
+void check_path(const std::string &path, const std::string &label, bool transmute, bool execute) {
     nftw_expected_label = label;
-    nftw_expected_transmute = true;
-    nftw_expected_exec = false;
+    nftw_expected_transmute = transmute;
+    nftw_expected_exec = execute;
 
     // check labels
     int result = nftw(path.c_str(), &nftw_check_sm_labels, FTW_MAX_FDS, FTW_PHYS);

diff --git a/src/security-manager-tests/common/sm_commons.h b/src/security-manager-tests/common/sm_commons.h
index 1f9d0da2bae7d8509391aa27234bae7d83490c07..5466b212b964c0aebc92bcb410ac38d72dcea660 100644 (file)
--- a/src/security-manager-tests/common/sm_commons.h
+++ b/src/security-manager-tests/common/sm_commons.h
@@ -70,7 +70,8 @@ void check_app_after_install(const std::string &app_id, const std::string &pkg_i
                              const privileges_t &denied_privs,
                              const std::vector<std::string> &allowed_groups,
                              bool isHybrid = false);
-void check_path(const std::string &path, const std::string &label);
+void check_path(const std::string &path, const std::string &label,
+                bool transmute = true, bool execute = false);
 void check_app_path_after_install(int app_num, const char *pkgId, bool others_enabled=false);
 void check_app_after_uninstall(const std::string &app_id, const std::string &pkg_id,
                                const bool is_pkg_removed);