Build: Move test partitions into the corresponding suites folder
TF-M test suites depended on related test services but the suite
code and service code are placed in different folders. This patch
moves test service code into related suite folder. It can make the
dependencies between test suites and test services more clear.
tfm_secure_client_2 and tfm_secure_client_service are required by
multi test suites, they are moved into a specific folder under test
path. tfm_test_manifest_list.yaml is moved at the root of test path.
Signed-off-by: Jianliang Shen <jianliang.shen@arm.com>
Change-Id: I9784bf614832680cf68fd8a19378446cbb2934e0
diff --git a/test/secure_fw/secure_tests.cmake b/test/secure_fw/secure_tests.cmake
index 87a5d42..ffb7b6b 100644
--- a/test/secure_fw/secure_tests.cmake
+++ b/test/secure_fw/secure_tests.cmake
@@ -12,14 +12,29 @@
tfm_toolchain_reload_compiler()
endif()
+# Install directory for non-secure interface API of test services
+# NS can pick up those interface files to build non-secure test cases
+set(TEST_SERVICE_SRC_INSTALL_DIR ${TFM_INSTALL_PATH}/interface/src/test_service)
+set(TEST_SERVICE_INC_INSTALL_DIR ${TFM_INSTALL_PATH}/interface/include/test_service)
+
# Test services are also required by some NS regression tests.
# Include test services at first no matter whether secure tests are enabled.
-add_subdirectory(test_services)
+add_subdirectory(suites/attestation/service)
+add_subdirectory(suites/core/service)
+add_subdirectory(suites/spm/ipc/service)
+add_subdirectory(suites/spm/sfn/service)
+add_subdirectory(suites/ps/service)
+add_subdirectory(suites/irq/service)
+add_subdirectory(suites/fpu/service)
if (NOT TEST_FRAMEWORK_S)
return()
endif()
+# secure test services are required if any secure test is opened
+add_subdirectory(common_test_services/tfm_secure_client_service)
+add_subdirectory(common_test_services/tfm_secure_client_2)
+
add_library(tfm_test_framework_s INTERFACE)
add_library(tfm_s_tests INTERFACE)