commit 342ec6812ff14fa0a4460795b316441a2315464d
author Kevin Peng <kevin.peng@arm.com> Fri Apr 29 10:36:58 2022 +0800
committer Kevin Peng <kevin.peng@arm.com> Fri May 06 12:12:40 2022 +0800
tree ba6df0c2bf176363cc838db56493188876e5554f
parent 689fee406ea0dd8de3cad107a132e1c845084b58

App: Combine the test threads together

This patch combines the test threads together to simplify
the codes and always build a test thread to output the EOT.

This also makes the output of EOT apply to non-test.

Change-Id: I4143dd9d59d663b432c599d36cddd26747d910af
Signed-off-by: Kevin Peng <kevin.peng@arm.com>

app/main_ns.c

diff --git a/app/main_ns.c b/app/main_ns.c
index e9ab48d..8189142 100644
--- a/app/main_ns.c
+++ b/app/main_ns.c
@@ -10,12 +10,7 @@
 #include "cmsis_compiler.h"
 #include "tfm_ns_interface.h"
 #include "tfm_nsid_manager.h"
-#if defined(TEST_FRAMEWORK_NS) || defined(TEST_FRAMEWORK_S)
-#include "tfm_integ_test.h"
-#endif
-#ifdef PSA_API_TEST_NS
-#include "psa_api_test.h"
-#endif
+#include "test_app.h"
 #include "tfm_plat_ns.h"
 #include "driver/Driver_USART.h"
 #include "device_cfg.h"
@@ -52,14 +47,16 @@
 /**
  * \brief List of RTOS thread attributes
  */
-#if defined(TEST_FRAMEWORK_NS) || defined(TEST_FRAMEWORK_S) \
- || defined(PSA_API_TEST_NS)
 static const osThreadAttr_t thread_attr = {
     .name = "test_thread",
     .stack_size = 4096U,
     .tz_module = ((TZ_ModuleId_t)TFM_DEFAULT_NSID)
 };
-#endif
+/**
+ * \brief Static globals to hold RTOS related quantities,
+ *        main thread
+ */
+static osThreadFunc_t thread_func = test_app;
 
 #ifdef TFM_MULTI_CORE_NS_OS_MAILBOX_THREAD
 static osThreadFunc_t mailbox_thread_func = tfm_ns_mailbox_thread_runner;
@@ -69,15 +66,6 @@
 };
 #endif
 
-/**
- * \brief Static globals to hold RTOS related quantities,
- *        main thread
- */
-#if defined(TEST_FRAMEWORK_NS) || defined(TEST_FRAMEWORK_S) \
- || defined(PSA_API_TEST_NS)
-static osThreadFunc_t thread_func;
-#endif
-
 #ifdef TFM_MULTI_CORE_TOPOLOGY
 static struct ns_mailbox_queue_t ns_mailbox_queue;
 
@@ -178,16 +166,7 @@
     (void) osThreadNew(mailbox_thread_func, NULL, &mailbox_thread_attr);
 #endif
 
-#if defined(TEST_FRAMEWORK_NS) || defined(TEST_FRAMEWORK_S)
-    thread_func = test_app;
-#elif defined(PSA_API_TEST_NS)
-    thread_func = psa_api_test;
-#endif
-
-#if defined(TEST_FRAMEWORK_NS) || defined(TEST_FRAMEWORK_S) \
- || defined(PSA_API_TEST_NS)
     (void) osThreadNew(thread_func, NULL, &thread_attr);
-#endif
 
     LOG_MSG("Non-Secure system starting...\r\n");
     (void) osKernelStart();