Test: Add USE_STDIO option for test logs
The clients like RPC test framework hosts may use the stdio provided by
toolchain.
This patch adds this config option for test log.
It also removes the unncessary inclusions of <stdio.h>.
They are partially for the log function and the rest for the <stddef.h>
which is included by stdio.h.
Change-Id: I79328d50b43e6c0b0d7ed55296c9973a90cb90e1
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
diff --git a/tests_reg/test/framework/test_framework.c b/tests_reg/test/framework/test_framework.c
index f9a5c4d..b9693b1 100644
--- a/tests_reg/test/framework/test_framework.c
+++ b/tests_reg/test/framework/test_framework.c
@@ -8,7 +8,6 @@
#include "test_framework.h"
#include <assert.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/tests_reg/test/framework/test_framework.h b/tests_reg/test/framework/test_framework.h
index c01c34d..ef614df 100644
--- a/tests_reg/test/framework/test_framework.h
+++ b/tests_reg/test/framework/test_framework.h
@@ -10,7 +10,6 @@
#include <stdarg.h>
#include <stdint.h>
-#include <stdio.h>
#include "test_log.h"
#include "test_framework_helpers.h"
diff --git a/tests_reg/test/framework/test_framework_helpers.c b/tests_reg/test/framework/test_framework_helpers.c
index a467a04..25a010f 100644
--- a/tests_reg/test/framework/test_framework_helpers.c
+++ b/tests_reg/test/framework/test_framework_helpers.c
@@ -7,8 +7,6 @@
#include "test_framework_helpers.h"
-#include <stdio.h>
-
void printf_set_color(enum serial_color_t color_id)
{
TEST_LOG("\33[%dm", color_id);
diff --git a/tests_reg/test/framework/test_framework_integ_test_helper.c b/tests_reg/test/framework/test_framework_integ_test_helper.c
index 3d0eefd..18dba96 100644
--- a/tests_reg/test/framework/test_framework_integ_test_helper.c
+++ b/tests_reg/test/framework/test_framework_integ_test_helper.c
@@ -5,7 +5,7 @@
*
*/
-#include <stdio.h>
+#include <stddef.h>
#include "test_framework.h"
#include "test_framework_integ_test_helper.h"
diff --git a/tests_reg/test/framework/test_log.h b/tests_reg/test/framework/test_log.h
index 1fc0b3d..995f726 100644
--- a/tests_reg/test/framework/test_log.h
+++ b/tests_reg/test/framework/test_log.h
@@ -10,6 +10,8 @@
#ifdef USE_SP_LOG
#include "tfm_sp_log.h"
+#elif defined USE_STDIO
+#include <stdio.h>
#else
#include "tfm_log_raw.h"
#endif /* USE_SP_LOG */
@@ -18,7 +20,7 @@
extern "C" {
#endif
-#ifdef USE_SP_LOG
+#if defined USE_SP_LOG || USE_STDIO
#define TEST_LOG(...) printf(__VA_ARGS__)
#else
#define TEST_LOG(...) tfm_log_printf(__VA_ARGS__)
diff --git a/tests_reg/test/ns_regression/CMakeLists.txt b/tests_reg/test/ns_regression/CMakeLists.txt
index 41208b2..95c55cf 100644
--- a/tests_reg/test/ns_regression/CMakeLists.txt
+++ b/tests_reg/test/ns_regression/CMakeLists.txt
@@ -41,6 +41,7 @@
INTERFACE
DOMAIN_NS=1
$<$<BOOL:${CONFIG_TFM_ERPC_TEST_FRAMEWORK}>:CONFIG_TFM_ERPC_TEST_FRAMEWORK=1>
+ $<$<BOOL:${USE_STDIO}>:USE_STDIO>
)
target_link_libraries(tfm_test_framework_ns
diff --git a/tests_reg/test/secure_fw/suites/nsid/non_secure/nsid_svc_handler.h b/tests_reg/test/secure_fw/suites/nsid/non_secure/nsid_svc_handler.h
old mode 100755
new mode 100644
index 65621fd..2208c2f
--- a/tests_reg/test/secure_fw/suites/nsid/non_secure/nsid_svc_handler.h
+++ b/tests_reg/test/secure_fw/suites/nsid/non_secure/nsid_svc_handler.h
@@ -9,7 +9,6 @@
#define __NSID_SVC_HANDLER_H__
#include <stdint.h>
-// #include <stdio.h>
#ifdef __cplusplus
extern "C" {
diff --git a/tests_reg/test/secure_fw/suites/ps/non_secure/psa_ps_ns_interface_testsuite.c b/tests_reg/test/secure_fw/suites/ps/non_secure/psa_ps_ns_interface_testsuite.c
index 4e8b9d1..1731db7 100644
--- a/tests_reg/test/secure_fw/suites/ps/non_secure/psa_ps_ns_interface_testsuite.c
+++ b/tests_reg/test/secure_fw/suites/ps/non_secure/psa_ps_ns_interface_testsuite.c
@@ -7,7 +7,6 @@
#include "ps_ns_tests.h"
-#include <stdio.h>
#include <string.h>
#include "config_tfm.h"
diff --git a/tests_reg/test/secure_fw/suites/ps/secure/ps_rollback_protection_testsuite.c b/tests_reg/test/secure_fw/suites/ps/secure/ps_rollback_protection_testsuite.c
index 2d37b64..25e9738 100644
--- a/tests_reg/test/secure_fw/suites/ps/secure/ps_rollback_protection_testsuite.c
+++ b/tests_reg/test/secure_fw/suites/ps/secure/ps_rollback_protection_testsuite.c
@@ -7,7 +7,6 @@
#include "ps_tests.h"
-#include <stdio.h>
#include <string.h>
#include "nv_counters/ps_nv_counters.h"
diff --git a/tests_reg/test/secure_fw/suites/ps/secure/psa_ps_s_interface_testsuite.c b/tests_reg/test/secure_fw/suites/ps/secure/psa_ps_s_interface_testsuite.c
index db912b4..9bad008 100644
--- a/tests_reg/test/secure_fw/suites/ps/secure/psa_ps_s_interface_testsuite.c
+++ b/tests_reg/test/secure_fw/suites/ps/secure/psa_ps_s_interface_testsuite.c
@@ -7,7 +7,6 @@
#include "ps_tests.h"
-#include <stdio.h>
#include <string.h>
#include "config_tfm.h"
diff --git a/tests_reg/test/secure_fw/suites/ps/secure/psa_ps_s_reliability_testsuite.c b/tests_reg/test/secure_fw/suites/ps/secure/psa_ps_s_reliability_testsuite.c
index 481a7a1..a807017 100644
--- a/tests_reg/test/secure_fw/suites/ps/secure/psa_ps_s_reliability_testsuite.c
+++ b/tests_reg/test/secure_fw/suites/ps/secure/psa_ps_s_reliability_testsuite.c
@@ -7,7 +7,6 @@
#include "ps_tests.h"
-#include <stdio.h>
#include <string.h>
#include "psa/protected_storage.h"
diff --git a/tests_reg/test/secure_fw/suites/qcbor/non_secure/qcbor_ns_testsuite.c b/tests_reg/test/secure_fw/suites/qcbor/non_secure/qcbor_ns_testsuite.c
index b6877fd..cc46b19 100644
--- a/tests_reg/test/secure_fw/suites/qcbor/non_secure/qcbor_ns_testsuite.c
+++ b/tests_reg/test/secure_fw/suites/qcbor/non_secure/qcbor_ns_testsuite.c
@@ -5,8 +5,8 @@
*
*/
+#include <stddef.h>
#include "qcbor_ns_tests.h"
-#include <stdio.h>
#include "run_tests.h"
/*
diff --git a/tests_reg/test/secure_fw/suites/spm/ipc/non_secure/ipc_ns_interface_testsuite.c b/tests_reg/test/secure_fw/suites/spm/ipc/non_secure/ipc_ns_interface_testsuite.c
index 0452029..09b14b5 100644
--- a/tests_reg/test/secure_fw/suites/spm/ipc/non_secure/ipc_ns_interface_testsuite.c
+++ b/tests_reg/test/secure_fw/suites/spm/ipc/non_secure/ipc_ns_interface_testsuite.c
@@ -5,7 +5,6 @@
*
*/
-#include <stdio.h>
#include "ipc_ns_tests.h"
#include "psa/client.h"
#include "psa/framework_feature.h"
diff --git a/tests_reg/test/secure_fw/suites/spm/sfn/sfn_backend_tests.c b/tests_reg/test/secure_fw/suites/spm/sfn/sfn_backend_tests.c
index fc316b5..4eeb2b3 100644
--- a/tests_reg/test/secure_fw/suites/spm/sfn/sfn_backend_tests.c
+++ b/tests_reg/test/secure_fw/suites/spm/sfn/sfn_backend_tests.c
@@ -5,7 +5,6 @@
*
*/
-#include <stdio.h>
#include <string.h>
#include "sfn_backend_tests.h"
diff --git a/tests_reg/test/secure_fw/suites/t_cose/non_secure/t_cose_ns_testsuite.c b/tests_reg/test/secure_fw/suites/t_cose/non_secure/t_cose_ns_testsuite.c
index ab60df8..0fadc94 100644
--- a/tests_reg/test/secure_fw/suites/t_cose/non_secure/t_cose_ns_testsuite.c
+++ b/tests_reg/test/secure_fw/suites/t_cose/non_secure/t_cose_ns_testsuite.c
@@ -5,8 +5,8 @@
*
*/
+#include <stddef.h>
#include "t_cose_ns_tests.h"
-#include <stdio.h>
#include "run_tests.h"
/*