Move test resource pkgs to give floor label

Change-Id: Ic815a2b3b4fda4a818c996af493b4962b1bd86a1
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09b403f..1aabfc1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,6 +48,7 @@ ADD_DEFINITIONS("-DPOPUP_SERVICE_ENV_FILE_PATH=\"${POPUP_SERVICE_ENV_FILE_PATH}\
 ADD_DEFINITIONS("-DENGINE_RW_WORKING_DIR=\"${ENGINE_RW_WORKING_DIR}\"")
 ADD_DEFINITIONS("-DENGINE_DIR=\"${ENGINE_DIR}\"")
 ADD_DEFINITIONS("-DTEST_DIR=\"${TEST_DIR}\"")
+ADD_DEFINITIONS("-DTEST_RES_DIR=\"${TEST_RES_DIR}\"")
 ADD_DEFINITIONS("-DDEFAULT_ICON_PATH=\"${RO_RES_DIR}/default-icon.png\"")
 
 IF (CMAKE_BUILD_TYPE MATCHES "DEBUG")

diff --git a/packaging/csr-framework.spec b/packaging/csr-framework.spec
index 817b7d8..c4ef8a0 100644 (file)
--- a/packaging/csr-framework.spec
+++ b/packaging/csr-framework.spec
@@ -62,6 +62,7 @@ file contents and checking url to prevent malicious items.
 %global engine_rw_working_dir        %{rw_data_dir}/%{service_name}/%{engine_rw_dir_name}
 %global engine_dir                   %{ro_data_dir}/%{service_name}/%{engine_ro_dir_name}
 %global test_dir                     %{rw_data_dir}/%{service_name}-test
+%global test_res_dir                 %{ro_data_dir}/%{service_name}-test
 
 %if "%{platform_version}" == "3.0"
 %global service_user                 security_fw
@@ -167,6 +168,7 @@ test program of csr-framework
     -DENGINE_DIR:PATH=%{engine_dir} \
     -DTEST_TARGET=%{test_target} \
     -DTEST_DIR:PATH=%{test_dir} \
+    -DTEST_RES_DIR:PATH=%{test_res_dir} \
 %if 0%{?with_detailed_base_url}
     -DDETAILED_URL_BASE:STRING=%{detailed_base_url} \
 %endif
@@ -324,6 +326,9 @@ fi
 %dir %attr(-, %{service_user}, %{service_group}) %{test_dir}
 %attr(-, %{service_user}, %{service_group}) %{test_dir}/*
 
+%dir %attr(-, %{service_user}, %{service_group}) %{test_res_dir}
+%attr(-, %{service_user}, %{service_group}) %{test_res_dir}/*
+
 # sample engine related files
 %if 0%{?with_sample_engine}
 %{engine_dir}/lib%{service_name}-cs-engine.so

diff --git a/packaging/csr-test.manifest.in b/packaging/csr-test.manifest.in
index 608a73d..7b37ccc 100644 (file)
--- a/packaging/csr-test.manifest.in
+++ b/packaging/csr-test.manifest.in
@@ -3,7 +3,7 @@
                <domain name="_" />
        </request>
        <assign>
-               <filesystem path="@BIN_DIR@" exec_label="@SMACK_DOMAIN_NAME@" />
+               <filesystem path="@BIN_DIR@/@SERVICE_NAME@-test" exec_label="@SMACK_DOMAIN_NAME@" />
                <filesystem path="@TEST_DIR@" label="@SMACK_DOMAIN_NAME@" type="transmutable" />
        </assign>
 </manifest>

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 51bff22..2d5f48a 100755 (executable)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -102,6 +102,7 @@ TARGET_LINK_LIBRARIES(${TARGET_CSR_TEST}
 
 INSTALL(TARGETS ${TARGET_CSR_TEST} DESTINATION ${BIN_DIR})
 INSTALL(DIRECTORY resources/ DESTINATION ${TEST_DIR})
+INSTALL(DIRECTORY pkgs/ DESTINATION ${TEST_RES_DIR})
 
 ADD_SUBDIRECTORY(internals)
 ADD_SUBDIRECTORY(popup)

diff --git a/test/resources/emulator/MaliciousTpk.tpk b/test/pkgs/emulator/MaliciousTpk.tpk
similarity index 100%
rename from test/resources/emulator/MaliciousTpk.tpk
rename to test/pkgs/emulator/MaliciousTpk.tpk

diff --git a/test/resources/target/MaliciousWgt.wgt b/test/pkgs/emulator/MaliciousWgt.wgt
similarity index 100%
rename from test/resources/target/MaliciousWgt.wgt
rename to test/pkgs/emulator/MaliciousWgt.wgt

diff --git a/test/resources/target/non-malware.wgt b/test/pkgs/emulator/non-malware.wgt
similarity index 100%
rename from test/resources/target/non-malware.wgt
rename to test/pkgs/emulator/non-malware.wgt

diff --git a/test/resources/target/MaliciousTpk.tpk b/test/pkgs/target/MaliciousTpk.tpk
similarity index 100%
rename from test/resources/target/MaliciousTpk.tpk
rename to test/pkgs/target/MaliciousTpk.tpk

diff --git a/test/resources/emulator/MaliciousWgt.wgt b/test/pkgs/target/MaliciousWgt.wgt
similarity index 100%
rename from test/resources/emulator/MaliciousWgt.wgt
rename to test/pkgs/target/MaliciousWgt.wgt

diff --git a/test/resources/emulator/non-malware.wgt b/test/pkgs/target/non-malware.wgt
similarity index 100%
rename from test/resources/emulator/non-malware.wgt
rename to test/pkgs/target/non-malware.wgt

diff --git a/test/test-resource.h b/test/test-resource.h
index ae456a2..e129569 100644 (file)
--- a/test/test-resource.h
+++ b/test/test-resource.h
@@ -40,18 +40,18 @@
 #define TEST_WGT_PKG_ID    "hFhcNcbE6K"
 #define TEST_WGT_APP_ROOT  TEST_DIR_APPS "/" TEST_WGT_PKG_ID
 #define TEST_WGT_MAL_FILE  TEST_WGT_APP_ROOT "/res/wgt/data/malicious.txt"
-#define TEST_WGT_PATH      TEST_DIR "/" TEST_TARGET "/MaliciousWgt.wgt"
+#define TEST_WGT_PATH      TEST_RES_DIR "/" TEST_TARGET "/MaliciousWgt.wgt"
 #define TEST_WGT_TYPE      "WGT"
 
 #define TEST_SAFE_WGT_PKG_ID   "q3JfX6RA5q"
 #define TEST_SAFE_WGT_APP_ROOT TEST_DIR_APPS "/" TEST_SAFE_WGT_PKG_ID
-#define TEST_SAFE_WGT_PATH     TEST_DIR "/" TEST_TARGET "/non-malware.wgt"
+#define TEST_SAFE_WGT_PATH     TEST_RES_DIR "/" TEST_TARGET "/non-malware.wgt"
 #define TEST_SAFE_WGT_TYPE     "WGT"
 
 #define TEST_TPK_PKG_ID    "org.example.malicioustpk"
 #define TEST_TPK_APP_ROOT  TEST_DIR_APPS "/" TEST_TPK_PKG_ID
 #define TEST_TPK_MAL_FILE  TEST_TPK_APP_ROOT "/shared/res/malicious.txt"
-#define TEST_TPK_PATH      TEST_DIR "/" TEST_TARGET "/MaliciousTpk.tpk"
+#define TEST_TPK_PATH      TEST_RES_DIR "/" TEST_TARGET "/MaliciousTpk.tpk"
 #define TEST_TPK_TYPE      "TPK"
 
 #define TEST_FAKE_APP_ROOT TEST_DIR_APPS "/fake_app"