aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie Fox <jamie.fox@arm.com>2019-06-19 11:55:59 +0100
committerKen Liu <ken.liu@arm.com>2019-07-22 06:15:59 +0000
commitbe4b587a9e480944b954c835e2ac2544ca7d195f (patch)
treef0d5adb226816514ad1667dafb9118d48db25902
parent0e8949239a2577a24943a2e592e17ade65fb78bd (diff)
downloadtrusted-firmware-m-be4b587a9e480944b954c835e2ac2544ca7d195f.tar.gz
Build: Remove deprecated test from CoreIPC config
Removes the deprecated test case from the CoreIPC build config, so that this build contains no test code. Change-Id: Id78f7d13f078cb2dbed65ac7ed7f56c2605d29db Signed-off-by: Jamie Fox <jamie.fox@arm.com>
-rw-r--r--CommonConfig.cmake6
-rw-r--r--test/suites/ipc/non_secure/ipc_ns_interface_testsuite.c13
2 files changed, 0 insertions, 19 deletions
diff --git a/CommonConfig.cmake b/CommonConfig.cmake
index 7ed545a2..18652eb7 100644
--- a/CommonConfig.cmake
+++ b/CommonConfig.cmake
@@ -175,12 +175,6 @@ if (CORE_TEST_IPC)
add_definitions(-DCORE_TEST_IPC)
set(TEST_FRAMEWORK_NS ON)
set(TFM_PARTITION_TEST_CORE_IPC ON)
-elseif (CORE_IPC AND (NOT PSA_API_TEST) AND (TFM_LVL EQUAL 1))
- # FIXME: Running the Core IPC tests in this config is deprecated and will
- # be removed in the future.
- set(CORE_TEST_IPC ON)
- add_definitions(-DCORE_TEST_IPC)
- set(TEST_FRAMEWORK_NS ON)
endif()
if (SERVICE_TEST_S)
diff --git a/test/suites/ipc/non_secure/ipc_ns_interface_testsuite.c b/test/suites/ipc/non_secure/ipc_ns_interface_testsuite.c
index 3d1eb06f..fb9bc3d1 100644
--- a/test/suites/ipc/non_secure/ipc_ns_interface_testsuite.c
+++ b/test/suites/ipc/non_secure/ipc_ns_interface_testsuite.c
@@ -15,7 +15,6 @@
/* List of tests */
static void tfm_ipc_test_1001(struct test_result_t *ret);
-#ifdef TFM_PARTITION_TEST_CORE_IPC
static void tfm_ipc_test_1002(struct test_result_t *ret);
static void tfm_ipc_test_1003(struct test_result_t *ret);
static void tfm_ipc_test_1004(struct test_result_t *ret);
@@ -33,10 +32,8 @@ static void tfm_ipc_test_1008(struct test_result_t *ret);
#ifdef TFM_IPC_ISOLATION_2_MEM_CHECK
static void tfm_ipc_test_1009(struct test_result_t *ret);
#endif
-#endif /* TFM_PARTITION_TEST_CORE_IPC */
static struct test_t ipc_veneers_tests[] = {
-#ifdef TFM_PARTITION_TEST_CORE_IPC
{&tfm_ipc_test_1001, "TFM_IPC_TEST_1001",
"Get PSA framework version", {0}},
{&tfm_ipc_test_1002, "TFM_IPC_TEST_1002",
@@ -61,10 +58,6 @@ static struct test_t ipc_veneers_tests[] = {
{&tfm_ipc_test_1009, "TFM_IPC_TEST_1009",
"Call APP RoT memory check test service", {0}},
#endif
-#else /* TFM_PARTITION_TEST_CORE_IPC */
- {&tfm_ipc_test_1001, "TFM_IPC_TEST_1001",
- "Deprecated", {0} },
-#endif /* TFM_PARTITION_TEST_CORE_IPC */
};
void register_testsuite_ns_ipc_interface(struct test_suite_t *p_test_suite)
@@ -86,7 +79,6 @@ void register_testsuite_ns_ipc_interface(struct test_suite_t *p_test_suite)
*/
static void tfm_ipc_test_1001(struct test_result_t *ret)
{
-#ifdef TFM_PARTITION_TEST_CORE_IPC
uint32_t version;
version = psa_framework_version();
@@ -96,12 +88,8 @@ static void tfm_ipc_test_1001(struct test_result_t *ret)
TEST_FAIL("The version of the PSA Framework API is not valid!\r\n");
return;
}
-#else /* TFM_PARTITION_TEST_CORE_IPC */
- TEST_LOG("Running IPC tests in this config is deprecated\r\n");
-#endif /* TFM_PARTITION_TEST_CORE_IPC */
}
-#ifdef TFM_PARTITION_TEST_CORE_IPC
/**
* \brief Retrieve the minor version of a RoT Service.
*/
@@ -336,4 +324,3 @@ static void tfm_ipc_test_1009(struct test_result_t *ret)
psa_close(handle);
}
#endif
-#endif /* TFM_PARTITION_TEST_CORE_IPC */