commit 5c04715e196ca7a6ee572088f8c088b3c41e6a17
author Mate Toth-Pal <mate.toth-pal@arm.com> Thu Feb 28 11:07:20 2019 +0100
committer Mate Toth-Pal <mate.toth-pal@arm.com> Wed Mar 13 13:15:23 2019 +0100
tree 7e92bf5e8a34490052df2a3f95a79df344c76b36
parent 67a87544e6c30ff354c23166377ddd5aa6a6d5dc

Test: Fix interactive core tests

Fix interactive core tests to work with uniform secure functions.

Change-Id: I7f57f1c7e2c13187ec60c328349f196d0770464c
Signed-off-by: Mate Toth-Pal <mate.toth-pal@arm.com>

app/tfm_integ_test.c

diff --git a/app/tfm_integ_test.c b/app/tfm_integ_test.c
index cd33b76..63ec8f3 100644
--- a/app/tfm_integ_test.c
+++ b/app/tfm_integ_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 - 2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2019, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -24,7 +24,7 @@
 
 #ifdef CORE_TEST_INTERACTIVE
 #include "test/test_services/tfm_core_test/core_test_defs.h"
-#include "test/test_services/tfm_core_test/tfm_ss_core_test_veneers.h"
+#include "tfm_veneers.h"
 
 #define TRY_SFN(fn, ...) \
     do { \
@@ -48,7 +48,10 @@
  */
 void secure_decrement_ns_lock_1(void)
 {
-    TRY_SFN(tfm_core_test_sfn, CORE_TEST_ID_BLOCK, 0x1, 0x1, 0x1);
+    uint32_t testcase_id = CORE_TEST_ID_BLOCK;
+    psa_invec in_vec = {&testcase_id, sizeof(testcase_id)};
+
+    TRY_SFN(tfm_spm_core_test_sfn_veneer, &in_vec, 1, NULL, 0);
 }
 
 /**
@@ -57,7 +60,10 @@
  */
 void secure_decrement_ns_lock_2(void)
 {
-    TRY_SFN(tfm_core_test_sfn, CORE_TEST_ID_BLOCK, 0x2, 0x2, 0x2);
+    uint32_t testcase_id = CORE_TEST_ID_BLOCK;
+    psa_invec in_vec = {&testcase_id, sizeof(testcase_id)};
+
+    TRY_SFN(tfm_spm_core_test_sfn_veneer, &in_vec, 1, NULL, 0);
 }
 /**
  * \brief Test definition for the RTX - TFM integration tests

secure_fw/core/secure_utilities.h

diff --git a/secure_fw/core/secure_utilities.h b/secure_fw/core/secure_utilities.h
index 3501a73..99962d3 100644
--- a/secure_fw/core/secure_utilities.h
+++ b/secure_fw/core/secure_utilities.h
@@ -8,6 +8,7 @@
 #ifndef __SECURE_UTILITIES_H__
 #define __SECURE_UTILITIES_H__
 
+#include <stdio.h>
 #include "cmsis_compiler.h"
 #include "tfm_svc.h"