Build: Enable IRQ test for SFN backend
Change-Id: Icd6e1ae07b646a7c877dc8949d272f5cddbcafe9
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
diff --git a/test/config/check_config.cmake b/test/config/check_config.cmake
index 0b1c725..b52e3a0 100644
--- a/test/config/check_config.cmake
+++ b/test/config/check_config.cmake
@@ -52,7 +52,7 @@
tfm_invalid_config(NOT TFM_PARTITION_AUDIT_LOG AND (TEST_NS_AUDIT OR TEST_S_AUDIT))
tfm_invalid_config((TEST_NS_IPC OR TEST_S_IPC OR TEST_NS_SLIH_IRQ OR TEST_NS_FLIH_IRQ) AND (TFM_LIB_MODEL))
-tfm_invalid_config((TEST_NS_IPC OR TEST_S_IPC OR TEST_NS_CORE OR TEST_NS_SLIH_IRQ OR TEST_NS_FLIH_IRQ) AND CONFIG_TFM_SPM_BACKEND_SFN)
+tfm_invalid_config((TEST_NS_IPC OR TEST_S_IPC OR TEST_NS_CORE) AND CONFIG_TFM_SPM_BACKEND_SFN)
tfm_invalid_config(TEST_S_SFN_BACKEND AND CONFIG_TFM_SPM_BACKEND_IPC)
tfm_invalid_config(CONFIG_TFM_FP STREQUAL "soft" AND (TEST_S_FPU OR TEST_NS_FPU))
diff --git a/test/config/set_config.cmake b/test/config/set_config.cmake
index 1fe94a8..70dd07d 100644
--- a/test/config/set_config.cmake
+++ b/test/config/set_config.cmake
@@ -107,12 +107,12 @@
########################## SLIH/FLIH IRQ Test ##################################
# Make FLIH IRQ test as the default IRQ test
-if (CONFIG_TFM_SPM_BACKEND_IPC AND PLATFORM_FLIH_IRQ_TEST_SUPPORT
+if (NOT TFM_LIB_MODEL AND PLATFORM_FLIH_IRQ_TEST_SUPPORT
AND TEST_NS AND NOT TEST_NS_SLIH_IRQ)
set(TEST_NS_FLIH_IRQ ON CACHE BOOL "Whether to build NS regression First-Level Interrupt Handling tests")
endif()
-if (CONFIG_TFM_SPM_BACKEND_IPC AND PLATFORM_SLIH_IRQ_TEST_SUPPORT
+if (NOT TFM_LIB_MODEL AND PLATFORM_SLIH_IRQ_TEST_SUPPORT
AND TEST_NS AND NOT TEST_NS_FLIH_IRQ)
set(TEST_NS_SLIH_IRQ ON CACHE BOOL "Whether to build NS regression Second-Level Interrupt Handling tests")
endif()
diff --git a/test/secure_fw/suites/spm/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
index 7088e85..5fe4f02 100644
--- a/test/secure_fw/suites/spm/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
@@ -10,7 +10,7 @@
"name": "TFM_SP_FLIH_TEST",
"type": "APPLICATION-ROT",
"priority": "NORMAL",
- "model": "IPC",
+ "model": "dual",
"entry_point": "tfm_flih_test_service_entry",
"stack_size": "0x0400",
"services": [
diff --git a/test/secure_fw/suites/spm/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
index 2e3b3c0..43a2af8 100644
--- a/test/secure_fw/suites/spm/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
@@ -10,7 +10,7 @@
"name": "TFM_SP_SLIH_TEST",
"type": "APPLICATION-ROT",
"priority": "NORMAL",
- "model": "IPC",
+ "model": "dual",
"entry_point": "tfm_slih_test_service_entry",
"stack_size": "0x0400",
"services": [