Test: Move IRQ test to spm test
This patch moves the SLIH and FLIH test to spm test.
Signed-off-by: Shawn Shan <Shawn.Shan@arm.com>
Change-Id: I80da86cc7424abc20deaf838fa2debe0e8055938
diff --git a/test/secure_fw/secure_tests.cmake b/test/secure_fw/secure_tests.cmake
index 26debd1..58a6a99 100644
--- a/test/secure_fw/secure_tests.cmake
+++ b/test/secure_fw/secure_tests.cmake
@@ -23,8 +23,8 @@
add_subdirectory(suites/core/service)
add_subdirectory(suites/spm/ipc/service)
add_subdirectory(suites/spm/sfn/service)
+add_subdirectory(suites/spm/irq/service)
add_subdirectory(suites/ps/service)
-add_subdirectory(suites/irq/service)
add_subdirectory(suites/fpu/service)
if (NOT TEST_FRAMEWORK_S)
diff --git a/test/secure_fw/suites/CMakeLists.txt b/test/secure_fw/suites/CMakeLists.txt
index 12dc7d6..21ec500 100644
--- a/test/secure_fw/suites/CMakeLists.txt
+++ b/test/secure_fw/suites/CMakeLists.txt
@@ -81,7 +81,6 @@
add_subdirectory(t_cose)
add_subdirectory(platform)
add_subdirectory(fwu)
-add_subdirectory(irq)
add_subdirectory(multi_core/non_secure)
add_subdirectory(nsid)
add_subdirectory(fpu)
diff --git a/test/secure_fw/suites/spm/CMakeLists.txt b/test/secure_fw/suites/spm/CMakeLists.txt
index 2c39078..09a488b 100755
--- a/test/secure_fw/suites/spm/CMakeLists.txt
+++ b/test/secure_fw/suites/spm/CMakeLists.txt
@@ -14,3 +14,4 @@
# Add ipc and sfn test suite.
add_subdirectory(ipc)
add_subdirectory(sfn)
+add_subdirectory(irq)
diff --git a/test/secure_fw/suites/irq/CMakeLists.txt b/test/secure_fw/suites/spm/irq/CMakeLists.txt
similarity index 100%
rename from test/secure_fw/suites/irq/CMakeLists.txt
rename to test/secure_fw/suites/spm/irq/CMakeLists.txt
diff --git a/test/secure_fw/suites/irq/irq_testsuite.c b/test/secure_fw/suites/spm/irq/irq_testsuite.c
similarity index 100%
rename from test/secure_fw/suites/irq/irq_testsuite.c
rename to test/secure_fw/suites/spm/irq/irq_testsuite.c
diff --git a/test/secure_fw/suites/irq/irq_testsuite.h b/test/secure_fw/suites/spm/irq/irq_testsuite.h
similarity index 100%
rename from test/secure_fw/suites/irq/irq_testsuite.h
rename to test/secure_fw/suites/spm/irq/irq_testsuite.h
diff --git a/test/secure_fw/suites/irq/service/CMakeLists.txt b/test/secure_fw/suites/spm/irq/service/CMakeLists.txt
similarity index 100%
rename from test/secure_fw/suites/irq/service/CMakeLists.txt
rename to test/secure_fw/suites/spm/irq/service/CMakeLists.txt
diff --git a/test/secure_fw/suites/irq/service/tfm_flih_test_service/CMakeLists.txt b/test/secure_fw/suites/spm/irq/service/tfm_flih_test_service/CMakeLists.txt
similarity index 100%
rename from test/secure_fw/suites/irq/service/tfm_flih_test_service/CMakeLists.txt
rename to test/secure_fw/suites/spm/irq/service/tfm_flih_test_service/CMakeLists.txt
diff --git a/test/secure_fw/suites/irq/service/tfm_flih_test_service/tfm_flih_test_service.c b/test/secure_fw/suites/spm/irq/service/tfm_flih_test_service/tfm_flih_test_service.c
similarity index 100%
rename from test/secure_fw/suites/irq/service/tfm_flih_test_service/tfm_flih_test_service.c
rename to test/secure_fw/suites/spm/irq/service/tfm_flih_test_service/tfm_flih_test_service.c
diff --git a/test/secure_fw/suites/irq/service/tfm_flih_test_service/tfm_flih_test_service.yaml b/test/secure_fw/suites/spm/irq/service/tfm_flih_test_service/tfm_flih_test_service.yaml
similarity index 100%
rename from test/secure_fw/suites/irq/service/tfm_flih_test_service/tfm_flih_test_service.yaml
rename to test/secure_fw/suites/spm/irq/service/tfm_flih_test_service/tfm_flih_test_service.yaml
diff --git a/test/secure_fw/suites/irq/service/tfm_flih_test_service/tfm_flih_test_service_types.h b/test/secure_fw/suites/spm/irq/service/tfm_flih_test_service/tfm_flih_test_service_types.h
similarity index 100%
rename from test/secure_fw/suites/irq/service/tfm_flih_test_service/tfm_flih_test_service_types.h
rename to test/secure_fw/suites/spm/irq/service/tfm_flih_test_service/tfm_flih_test_service_types.h
diff --git a/test/secure_fw/suites/irq/service/tfm_slih_test_service/CMakeLists.txt b/test/secure_fw/suites/spm/irq/service/tfm_slih_test_service/CMakeLists.txt
similarity index 100%
rename from test/secure_fw/suites/irq/service/tfm_slih_test_service/CMakeLists.txt
rename to test/secure_fw/suites/spm/irq/service/tfm_slih_test_service/CMakeLists.txt
diff --git a/test/secure_fw/suites/irq/service/tfm_slih_test_service/tfm_slih_test_service.c b/test/secure_fw/suites/spm/irq/service/tfm_slih_test_service/tfm_slih_test_service.c
similarity index 100%
rename from test/secure_fw/suites/irq/service/tfm_slih_test_service/tfm_slih_test_service.c
rename to test/secure_fw/suites/spm/irq/service/tfm_slih_test_service/tfm_slih_test_service.c
diff --git a/test/secure_fw/suites/irq/service/tfm_slih_test_service/tfm_slih_test_service.yaml b/test/secure_fw/suites/spm/irq/service/tfm_slih_test_service/tfm_slih_test_service.yaml
similarity index 100%
rename from test/secure_fw/suites/irq/service/tfm_slih_test_service/tfm_slih_test_service.yaml
rename to test/secure_fw/suites/spm/irq/service/tfm_slih_test_service/tfm_slih_test_service.yaml
diff --git a/test/secure_fw/suites/irq/service/tfm_slih_test_service/tfm_slih_test_service_types.h b/test/secure_fw/suites/spm/irq/service/tfm_slih_test_service/tfm_slih_test_service_types.h
similarity index 100%
rename from test/secure_fw/suites/irq/service/tfm_slih_test_service/tfm_slih_test_service_types.h
rename to test/secure_fw/suites/spm/irq/service/tfm_slih_test_service/tfm_slih_test_service_types.h
diff --git a/test/secure_fw/tfm_test_manifest_list.yaml b/test/secure_fw/tfm_test_manifest_list.yaml
index 9175fbb..641dc2f 100644
--- a/test/secure_fw/tfm_test_manifest_list.yaml
+++ b/test/secure_fw/tfm_test_manifest_list.yaml
@@ -134,7 +134,7 @@
{
"name": "TFM SLIH Test Service",
"short_name": "TFM_SP_SLIH_TEST",
- "manifest": "suites/irq/service/tfm_slih_test_service/tfm_slih_test_service.yaml",
+ "manifest": "suites/spm/irq/service/tfm_slih_test_service/tfm_slih_test_service.yaml",
"output_path": "secure_fw/test_services/tfm_slih_test_service",
"conditional": "@TEST_NS_SLIH_IRQ@",
"version_major": 0,
@@ -149,7 +149,7 @@
{
"name": "TFM FLIH Test Service",
"short_name": "TFM_SP_FLIH_TEST",
- "manifest": "suites/irq/service/tfm_flih_test_service/tfm_flih_test_service.yaml",
+ "manifest": "suites/spm/irq/service/tfm_flih_test_service/tfm_flih_test_service.yaml",
"output_path": "secure_fw/test_services/tfm_flih_test_service",
"conditional": "@TEST_NS_FLIH_IRQ@",
"version_major": 0,