commit aecf99753174b6d8e2853fe85dd0a5fbdd036b1c
author David Hu <david.hu@arm.com> Thu Apr 06 17:41:16 2023 +0800
committer David Hu <david.hu@arm.com> Sat Apr 08 19:33:44 2023 +0800
tree 120f5a08a4d710829853e948466644a881372bd6
parent 7cf20ef136068907953f78c6749269f7c5fe1cd8

Test: Simplify regression test build control

Remove TEST_FRAMEWORK_S/NS.
TEST_FRAMEWORK_NS/S can be replaced by the pair of TEST_NS/S_REG_TEST
and NS. It can remove duplicated test flags

Signed-off-by: David Hu <david.hu@arm.com>
Change-Id: Ida6b6dd951c29e0483a276c411d67874317e08ba

app/CMakeLists.txt

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 3a3ee09..d71ad6f 100755
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -275,7 +275,7 @@
 
 target_link_libraries(tfm_test_app
     PRIVATE
-        $<$<BOOL:${TEST_FRAMEWORK_NS}>:tfm_ns_tests>
+        $<$<BOOL:${TFM_NS_REG_TEST}>:tfm_ns_tests>
         $<$<BOOL:${TEST_PSA_API}>:val_nspe>
         $<$<BOOL:${TEST_PSA_API}>:pal_nspe>
         $<$<BOOL:${TEST_PSA_API}>:test_combine>
@@ -286,8 +286,7 @@
 
 target_compile_definitions(tfm_test_app
     PRIVATE
-        $<$<BOOL:${TEST_FRAMEWORK_NS}>:TEST_FRAMEWORK_NS>
-        $<$<BOOL:${TEST_FRAMEWORK_S}>:TEST_FRAMEWORK_S>
+        $<$<BOOL:${TFM_NS_REG_TEST}>:TFM_NS_REG_TEST>
         $<$<BOOL:${TEST_PSA_API}>:PSA_API_TEST_NS>
 )
 

app/test_app.c

diff --git a/app/test_app.c b/app/test_app.c
index 1efc45f..0e26e89 100644
--- a/app/test_app.c
+++ b/app/test_app.c
@@ -8,7 +8,7 @@
 #include "test_app.h"
 #include "tfm_log.h"
 
-#ifdef TEST_FRAMEWORK_NS
+#ifdef TFM_NS_REG_TEST
 #include "test_framework_integ_test.h"
 #endif
 
@@ -29,7 +29,7 @@
 {
     UNUSED_VARIABLE(argument);
 
-#ifdef TEST_FRAMEWORK_NS
+#ifdef TFM_NS_REG_TEST
     tfm_non_secure_client_run_tests();
 #endif