Build: Disable SPM Model specific test suites
This patch disables SPM Model specific test suites by default
and enables them respectively, to make the set_config.cmake simpler.
Change-Id: Ic0a7c311c9d298bc62886106d8136a73c7622e9c
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
diff --git a/test/config/default_ns_test_config.cmake b/test/config/default_ns_test_config.cmake
index f236392..29b7925 100644
--- a/test/config/default_ns_test_config.cmake
+++ b/test/config/default_ns_test_config.cmake
@@ -15,21 +15,17 @@
set(TEST_NS_T_COSE ON CACHE BOOL "Whether to build NS regression t_cose tests")
set(TEST_NS_QCBOR ON CACHE BOOL "Whether to build NS regression QCBOR tests")
set(TEST_NS_AUDIT ON CACHE BOOL "Whether to build NS regression Audit log tests")
-set(TEST_NS_CORE ON CACHE BOOL "Whether to build NS regression Core tests")
set(TEST_NS_CRYPTO ON CACHE BOOL "Whether to build NS regression Crypto tests")
set(TEST_NS_ITS ON CACHE BOOL "Whether to build NS regression ITS tests")
set(TEST_NS_PS ON CACHE BOOL "Whether to build NS regression PS tests")
set(TEST_NS_PLATFORM ON CACHE BOOL "Whether to build NS regression Platform tests")
set(TEST_NS_FWU ON CACHE BOOL "Whether to build NS regression FWU tests")
-set(TEST_NS_IPC ON CACHE BOOL "Whether to build NS regression IPC tests")
-set(TEST_NS_SLIH_IRQ OFF CACHE BOOL "Whether to build NS regression Second-Level Interrupt Handling tests")
-set(TEST_NS_FLIH_IRQ OFF CACHE BOOL "Whether to build NS regression First-Level Interrupt Handling tests")
set(TEST_NS_MULTI_CORE ON CACHE BOOL "Whether to build NS regression multi-core tests")
set(TEST_NS_MANAGE_NSID ON CACHE BOOL "Whether to build NS regression NSID management tests")
+
+set(TEST_NS_SLIH_IRQ OFF CACHE BOOL "Whether to build NS regression Second-Level Interrupt Handling tests")
+set(TEST_NS_FLIH_IRQ OFF CACHE BOOL "Whether to build NS regression First-Level Interrupt Handling tests")
set(TEST_NS_FPU OFF CACHE BOOL "Whether to build NS regression FPU tests")
+set(TEST_NS_IPC OFF CACHE BOOL "Whether to build NS regression IPC tests")
set(TEST_NS_SFN_BACKEND OFF CACHE BOOL "Whether to build NS regression SFN backend tests")
-
-######################### Platform specific setting ############################
-
-set(PLATFORM_SLIH_IRQ_TEST_SUPPORT OFF CACHE BOOL "Platform supports SLIH IRQ tests")
-set(PLATFORM_FLIH_IRQ_TEST_SUPPORT OFF CACHE BOOL "Platform supports FLIH IRQ tests")
+set(TEST_NS_CORE OFF CACHE BOOL "Whether to build NS regression Core tests")
diff --git a/test/config/default_s_test_config.cmake b/test/config/default_s_test_config.cmake
index b2a8575..05ad57a 100644
--- a/test/config/default_s_test_config.cmake
+++ b/test/config/default_s_test_config.cmake
@@ -17,6 +17,7 @@
set(TEST_S_ITS ON CACHE BOOL "Whether to build S regression ITS tests")
set(TEST_S_PS ON CACHE BOOL "Whether to build S regression PS tests")
set(TEST_S_PLATFORM ON CACHE BOOL "Whether to build S regression Platform tests")
+
set(TEST_S_FWU OFF CACHE BOOL "Whether to build S regression FWU tests")
-set(TEST_S_IPC ON CACHE BOOL "Whether to build S regression IPC tests")
+set(TEST_S_IPC OFF CACHE BOOL "Whether to build S regression IPC tests")
set(TEST_S_FPU OFF CACHE BOOL "Whether to build S regression FPU tests")
diff --git a/test/config/set_config.cmake b/test/config/set_config.cmake
index e51a663..455406d 100644
--- a/test/config/set_config.cmake
+++ b/test/config/set_config.cmake
@@ -51,21 +51,6 @@
set(TEST_S_AUDIT OFF CACHE BOOL "Whether to build S regression Audit log tests")
endif()
-if (TFM_LIB_MODEL)
- set(TEST_NS_IPC OFF CACHE BOOL "Whether to build NS regression IPC tests")
- set(TEST_S_IPC OFF CACHE BOOL "Whether to build S regression IPC tests")
-
- set(TEST_NS_SLIH_IRQ OFF CACHE BOOL "Whether to build NS regression Second-Level Interrupt Handling tests")
- set(TEST_NS_FLIH_IRQ OFF CACHE BOOL "Whether to build NS regression First-Level Interrupt Handling tests")
-elseif(CONFIG_TFM_SPM_BACKEND_SFN)
- set(TEST_NS_IPC OFF CACHE BOOL "Whether to build NS regression IPC tests")
- set(TEST_NS_CORE OFF CACHE BOOL "Whether to build NS regression Core tests")
- set(TEST_S_IPC OFF CACHE BOOL "Whether to build S regression IPC tests")
-
- set(TEST_NS_SLIH_IRQ OFF CACHE BOOL "Whether to build NS regression Second-Level Interrupt Handling tests")
- set(TEST_NS_FLIH_IRQ OFF CACHE BOOL "Whether to build NS regression First-Level Interrupt Handling tests")
-endif()
-
if (NOT TFM_MULTI_CORE_TOPOLOGY)
set(TEST_NS_MULTI_CORE OFF CACHE BOOL "Whether to build NS regression multi-core tests")
endif()
@@ -132,12 +117,26 @@
set(TEST_NS_SLIH_IRQ ON CACHE BOOL "Whether to build NS regression Second-Level Interrupt Handling tests")
endif()
+############################ IPC backend test ##################################
+if (CONFIG_TFM_SPM_BACKEND_IPC AND TEST_NS)
+ set(TEST_NS_IPC ON CACHE BOOL "Whether to build NS regression SFN backend tests")
+endif()
+
+if (CONFIG_TFM_SPM_BACKEND_IPC AND TEST_S)
+ set(TEST_S_IPC ON CACHE BOOL "Whether to build NS regression SFN backend tests")
+endif()
+
############################ SFN backend test ##################################
if (CONFIG_TFM_SPM_BACKEND_SFN AND TEST_NS)
set(TEST_NS_SFN_BACKEND ON CACHE BOOL "Whether to build NS regression SFN backend tests")
endif()
+######################### Library Model Specific Tests #########################
+if (TFM_LIB_MODEL AND TEST_NS)
+ set(TEST_NS_CORE ON CACHE BOOL "Whether to build NS regression Core tests")
+endif()
+
########################## Load default config #################################
if (TEST_S)