Test: fix secure test client partition
This change is necessary to execute test cases in the secure
test client partition in case of TFM_LVL==3:
- rename files in test/framework folder, prefix was added
- add missing files to test client partition in linker scripts
- add execution region for secure test client partition in
Musca A1 linker config file
- update affected files due to renaming
Change-Id: If9605ad65daf4341d3e520ae69ba4d9d7f31415c
Signed-off-by: Tamas Ban <tamas.ban@arm.com>
diff --git a/test/framework/CMakeLists.inc b/test/framework/CMakeLists.inc
index 0f22dbc..d8abf61 100644
--- a/test/framework/CMakeLists.inc
+++ b/test/framework/CMakeLists.inc
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2017, Arm Limited. All rights reserved.
+# Copyright (c) 2017-2018, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -24,8 +24,8 @@
message(FATAL_ERROR "Please set TFM_ROOT_DIR before including this file.")
endif()
-set (TEST_FRAMEWORK_C_SRC "${TEST_FRAMEWORK_DIR}/helpers.c"
- "${TEST_FRAMEWORK_DIR}/integ_test_helper.c"
+set (TEST_FRAMEWORK_C_SRC "${TEST_FRAMEWORK_DIR}/test_framework_helpers.c"
+ "${TEST_FRAMEWORK_DIR}/test_framework_integ_test_helper.c"
"${TEST_FRAMEWORK_DIR}/test_framework.c"
)
diff --git a/test/framework/non_secure_suites.c b/test/framework/non_secure_suites.c
index 51ed186..4b11386 100644
--- a/test/framework/non_secure_suites.c
+++ b/test/framework/non_secure_suites.c
@@ -5,8 +5,8 @@
*
*/
-#include "integ_test.h"
-#include "integ_test_helper.h"
+#include "test_framework_integ_test.h"
+#include "test_framework_integ_test_helper.h"
#include "test_framework.h"
/* Service specific includes */
diff --git a/test/framework/secure_suites.c b/test/framework/secure_suites.c
index 63f0e96..9205e99 100644
--- a/test/framework/secure_suites.c
+++ b/test/framework/secure_suites.c
@@ -5,8 +5,8 @@
*
*/
-#include "integ_test.h"
-#include "integ_test_helper.h"
+#include "test_framework_integ_test.h"
+#include "test_framework_integ_test_helper.h"
#include "test_framework.h"
/* Service specific includes */
@@ -28,7 +28,7 @@
/* Secure invert test cases */
/* Note: since this is sample code, only run if test services are enabled */
{®ister_testsuite_s_invert_interface, 0, 0, 0},
-#endif
+#endif /* TFM_PARTITION_TEST_CORE*/
#endif /* SERVICES_TEST_S */
};
diff --git a/test/framework/test_framework.c b/test/framework/test_framework.c
index fcb7451..e991dd4 100644
--- a/test/framework/test_framework.c
+++ b/test/framework/test_framework.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2018, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -12,8 +12,6 @@
#include <stdlib.h>
#include <string.h>
-#include "helpers.h"
-
static void test_failed(const struct test_result_t *ret)
{
printf_set_color(RED);
diff --git a/test/framework/test_framework.h b/test/framework/test_framework.h
index 4716d43..a2b64c4 100644
--- a/test/framework/test_framework.h
+++ b/test/framework/test_framework.h
@@ -11,7 +11,7 @@
#include <stdarg.h>
#include <stdint.h>
-#include "helpers.h"
+#include "test_framework_helpers.h"
#ifdef __cplusplus
extern "C" {
diff --git a/test/framework/helpers.c b/test/framework/test_framework_helpers.c
similarity index 97%
rename from test/framework/helpers.c
rename to test/framework/test_framework_helpers.c
index be2d188..d9870f4 100755
--- a/test/framework/helpers.c
+++ b/test/framework/test_framework_helpers.c
@@ -5,7 +5,7 @@
*
*/
-#include "helpers.h"
+#include "test_framework_helpers.h"
#include <stdio.h>
diff --git a/test/framework/helpers.h b/test/framework/test_framework_helpers.h
similarity index 100%
rename from test/framework/helpers.h
rename to test/framework/test_framework_helpers.h
diff --git a/test/framework/integ_test.h b/test/framework/test_framework_integ_test.h
similarity index 100%
rename from test/framework/integ_test.h
rename to test/framework/test_framework_integ_test.h
diff --git a/test/framework/integ_test_helper.c b/test/framework/test_framework_integ_test_helper.c
similarity index 91%
rename from test/framework/integ_test_helper.c
rename to test/framework/test_framework_integ_test_helper.c
index 264b197..ac7021e 100644
--- a/test/framework/integ_test_helper.c
+++ b/test/framework/test_framework_integ_test_helper.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2018, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -8,7 +8,7 @@
#include <stdio.h>
#include "test_framework.h"
-#include "integ_test_helper.h"
+#include "test_framework_integ_test_helper.h"
void integ_test(const char *suite_type,
struct test_suite_t test_suites[],
diff --git a/test/framework/integ_test_helper.h b/test/framework/test_framework_integ_test_helper.h
similarity index 100%
rename from test/framework/integ_test_helper.h
rename to test/framework/test_framework_integ_test_helper.h