commit 5f72b756da75ebab39d414461ba680401fb84bac
author Antonio de Angelis <Antonio.deAngelis@arm.com> Thu Jun 03 18:36:20 2021 +0100
committer Anton Komlev <Anton.Komlev@arm.com> Tue Jun 08 01:43:09 2021 +0200
tree f535bd97c6c3c591366ecd177aae14c39d1c74ce
parent e212bcc7d740886ebe043d439774fedce7abed18

Test: Don't expect a particular error code in tfm_core_get_caller_client_id()

As the library mode memory check function can now return different error
codes, don't expect a particular error code when testing the negative
test case steps of tfm_core_get_caller_client_id(), but just keep it as
a generic check against the TFM_SUCCESS return code.

Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com>
Change-Id: Id370d941eb85855858934d16ce64d8f047f4891b

test/test_services/tfm_core_test/tfm_ss_core_test.c

diff --git a/test/test_services/tfm_core_test/tfm_ss_core_test.c b/test/test_services/tfm_core_test/tfm_ss_core_test.c
index 83d6abf..e085902 100644
--- a/test/test_services/tfm_core_test/tfm_ss_core_test.c
+++ b/test/test_services/tfm_core_test/tfm_ss_core_test.c
@@ -1,14 +1,13 @@
 /*
- * Copyright (c) 2017-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2021, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
  */
 
 #include <stddef.h>
-#include "tfm_ss_core_test.h"
-#include "tfm_api.h"
 #include "core_test_defs.h"
+#include "tfm_ss_core_test.h"
 #include "test_framework.h"
 #include "tfm_veneers.h"
 #include "tfm_secure_api.h"
@@ -40,7 +39,6 @@
 static int32_t caller_client_id_rw = INVALID_NS_CLIENT_ID;
 
 static int32_t* invalid_addresses [] = {(int32_t*)0x0, (int32_t*)0xFFF12000};
-
 #else /* !defined(TFM_PSA_API) */
 
 static psa_status_t psa_test_common(uint32_t sid, uint32_t version,
@@ -307,7 +305,7 @@
     for (i = 0; i < sizeof(invalid_addresses)/sizeof(invalid_addresses[0]); ++i)
     {
         ret = tfm_core_get_caller_client_id(invalid_addresses[i]);
-        if (ret != TFM_ERROR_INVALID_PARAMETER) {
+        if (ret == TFM_SUCCESS) {
             return CORE_TEST_ERRNO_TEST_FAULT;
         }
     }

test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c

diff --git a/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c b/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c
index 40adf85..6249c16 100644
--- a/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c
+++ b/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2021, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -8,7 +8,6 @@
 #include <stddef.h>
 #include "core_test_defs.h"
 #include "tfm_ss_core_test_2.h"
-#include "tfm_api.h"
 #include "tfm_secure_api.h"
 #include "psa/service.h"
 #include "psa_manifest/pid.h"
@@ -65,7 +64,7 @@
     for (i = 0; i < sizeof(invalid_addresses)/sizeof(invalid_addresses[0]); ++i)
     {
         ret = tfm_core_get_caller_client_id(invalid_addresses[i]);
-        if (ret != TFM_ERROR_INVALID_PARAMETER) {
+        if (ret == TFM_SUCCESS) {
             return CORE_TEST_ERRNO_TEST_FAULT;
         }
     }