aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorKevin Peng <kevin.peng@arm.com>2020-01-22 15:49:29 +0800
committerKevin Peng <kevin.peng@arm.com>2020-04-21 03:21:53 +0000
commit726ad7af211437c543c59be2b9fe3d19b8032640 (patch)
tree087efaf460febe2fb4631643e9b1ccbb57a2a184 /test
parent8e65396ab232550892c682f6930a4e949247466e (diff)
downloadtrusted-firmware-m-726ad7af211437c543c59be2b9fe3d19b8032640.tar.gz
Build: Minor refine for build configurations
The patch includes 3 refines: 1. Removes deprecated TFM_LEGACY_API config 2. CORE_TEST_POSITIVE tests can be enabled only in TFM isolation level 1. The check is currently done in the non_secure_suites.c. This patch moves the check from source file to CMake file to align with the other test suites. 3. Removes extra #if check for audit log test suite in source code. The check has been done in CMake Change-Id: I1b28f5f5139a0ff762f73334aadd38a931440b29 Signed-off-by: Kevin Peng <kevin.peng@arm.com>
Diffstat (limited to 'test')
-rw-r--r--test/framework/non_secure_suites.c2
-rw-r--r--test/framework/secure_suites.c9
2 files changed, 1 insertions, 10 deletions
diff --git a/test/framework/non_secure_suites.c b/test/framework/non_secure_suites.c
index 58e474c92c..c1af79c2a4 100644
--- a/test/framework/non_secure_suites.c
+++ b/test/framework/non_secure_suites.c
@@ -68,11 +68,9 @@ static struct test_suite_t test_suites[] = {
#endif /* SERVICES_TEST_NS */
#ifdef CORE_TEST_POSITIVE
-#if !defined(TFM_PSA_API) || (TFM_LVL == 1)
/* Non-secure core test cases */
{&register_testsuite_ns_core_positive, 0, 0, 0},
#endif
-#endif
#ifdef CORE_TEST_INTERACTIVE
/* Non-secure interactive test cases */
diff --git a/test/framework/secure_suites.c b/test/framework/secure_suites.c
index 84cdf0048e..1e7caa913f 100644
--- a/test/framework/secure_suites.c
+++ b/test/framework/secure_suites.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -52,18 +52,11 @@ static struct test_suite_t test_suites[] = {
{&register_testsuite_s_platform_interface, 0, 0, 0},
#endif
-#ifndef TFM_PSA_API
- /*
- * FixMe: since the following partitions haven't implement the IPC model,
- * they will block the process. Skip them in IPC model.
- */
#ifdef ENABLE_AUDIT_LOGGING_SERVICE_TESTS
/* Secure Audit Logging test cases */
{&register_testsuite_s_audit_interface, 0, 0, 0},
#endif
-#endif
-
#ifdef ENABLE_IPC_TEST
/* Secure IPC test cases */
{&register_testsuite_s_ipc_interface, 0, 0, 0},