aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorKen Liu <ken.liu@arm.com>2020-05-30 21:11:05 +0800
committerKen Liu <ken.liu@arm.com>2020-06-03 10:33:45 +0800
commit1f345b0d3f51b547c6422febc5f5a5956a1f81bb (patch)
tree98d33f783c66934e2fbf58218960e3e77a5ee25c /test
parentb157dca40dcf2051a0420cb16d659a6aa69335d7 (diff)
downloadtrusted-firmware-m-1f345b0d3f51b547c6422febc5f5a5956a1f81bb.tar.gz
Build: Follow the 'source_structure.rst'
This is the first patch to follow the first commit of source structure document. The items under the 'secure_fw' folder are re-organized: - Create/Move some folders/files to follow document. - Rename some folders to foll, for example, 'secure_fw/services' to 'secure_fw/partitions'. - Update affected files to make it work. This is a big change, to make the structure meet the basic shape of the structure document defined, and make it easier to be understood for users. Staging changes are not applicable so they are combined into one - and because it is not the final shape yet, so: - Upcoming updates on the 'secure_fw' folder would follow up soon. - Fine-tune about the 'source_structure.rst' would come, too. Change-Id: I5c11175e0a4579cd9b42d3e3519dbffb87334d0b Signed-off-by: Ken Liu <ken.liu@arm.com>
Diffstat (limited to 'test')
-rw-r--r--test/suites/attestation/CMakeLists.inc2
-rw-r--r--test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c2
-rw-r--r--test/suites/attestation/secure/attestation_s_interface_testsuite.c2
-rw-r--r--test/suites/audit/non_secure/audit_ns_interface_testsuite.c2
-rw-r--r--test/suites/audit/secure/audit_s_interface_testsuite.c2
-rw-r--r--test/suites/core/non_secure/core_ns_positive_testsuite.c1
-rw-r--r--test/suites/sst/secure/nv_counters/test_sst_nv_counters.c4
-rw-r--r--test/suites/sst/secure/sst_rollback_protection_testsuite.c2
-rw-r--r--test/test_services/CMakeLists.inc4
-rw-r--r--test/test_services/tfm_core_test/core_test_defs.h1
-rw-r--r--test/test_services/tfm_core_test/tfm_ss_core_test.c4
-rw-r--r--test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c2
-rw-r--r--test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.c4
-rw-r--r--test/test_services/tfm_sst_test_service/tfm_sst_test_service.c2
14 files changed, 17 insertions, 17 deletions
diff --git a/test/suites/attestation/CMakeLists.inc b/test/suites/attestation/CMakeLists.inc
index 2eb344f3a7..76935fa643 100644
--- a/test/suites/attestation/CMakeLists.inc
+++ b/test/suites/attestation/CMakeLists.inc
@@ -55,7 +55,7 @@ elseif(ENABLE_ATTESTATION_SERVICE_TESTS)
#Setting include directories
embedded_include_directories(PATH ${TFM_ROOT_DIR} ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/interface/include ABSOLUTE)
- embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/services/initial_attestation ABSOLUTE)
+ embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/partitions/initial_attestation ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/lib/ext/qcbor/inc ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/lib/ext/qcbor/util ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/lib/ext/t_cose/inc ABSOLUTE)
diff --git a/test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c b/test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c
index b739b9a267..e827ae279c 100644
--- a/test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c
+++ b/test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c
@@ -7,7 +7,7 @@
#include "attestation_ns_tests.h"
#include "psa/initial_attestation.h"
-#include "secure_fw/services/initial_attestation/attestation.h"
+#include "attestation.h"
#include "../attestation_tests_common.h"
#include "../attest_token_test_values.h"
#include "../attest_token_test.h"
diff --git a/test/suites/attestation/secure/attestation_s_interface_testsuite.c b/test/suites/attestation/secure/attestation_s_interface_testsuite.c
index a01303b4d5..0ff7df1634 100644
--- a/test/suites/attestation/secure/attestation_s_interface_testsuite.c
+++ b/test/suites/attestation/secure/attestation_s_interface_testsuite.c
@@ -7,7 +7,7 @@
#include "attestation_s_tests.h"
#include "psa/initial_attestation.h"
-#include "secure_fw/services/initial_attestation/attestation.h"
+#include "secure_fw/partitions/initial_attestation/attestation.h"
#include "../attestation_tests_common.h"
#include "../attest_token_test_values.h"
#include "../attest_token_test.h"
diff --git a/test/suites/audit/non_secure/audit_ns_interface_testsuite.c b/test/suites/audit/non_secure/audit_ns_interface_testsuite.c
index 1dfe049582..a6179acdd7 100644
--- a/test/suites/audit/non_secure/audit_ns_interface_testsuite.c
+++ b/test/suites/audit/non_secure/audit_ns_interface_testsuite.c
@@ -9,7 +9,7 @@
#include "psa_audit_api.h"
#include "audit_ns_tests.h"
#include "tfm_api.h"
-#include "secure_fw/services/audit_logging/audit_core.h"
+#include "secure_fw/partitions/audit_logging/audit_core.h"
#include "../audit_tests_common.h"
diff --git a/test/suites/audit/secure/audit_s_interface_testsuite.c b/test/suites/audit/secure/audit_s_interface_testsuite.c
index 7bda71e0c4..550ec10710 100644
--- a/test/suites/audit/secure/audit_s_interface_testsuite.c
+++ b/test/suites/audit/secure/audit_s_interface_testsuite.c
@@ -10,7 +10,7 @@
#include "audit_s_tests.h"
#include "tfm_api.h"
#include "psa_audit_api.h"
-#include "secure_fw/services/audit_logging/audit_core.h"
+#include "secure_fw/partitions/audit_logging/audit_core.h"
#include "../audit_tests_common.h"
diff --git a/test/suites/core/non_secure/core_ns_positive_testsuite.c b/test/suites/core/non_secure/core_ns_positive_testsuite.c
index 7d86dca850..794e7d97dc 100644
--- a/test/suites/core/non_secure/core_ns_positive_testsuite.c
+++ b/test/suites/core/non_secure/core_ns_positive_testsuite.c
@@ -10,6 +10,7 @@
#include <string.h>
#include "core_ns_tests.h"
+#include "cmsis.h"
#include "tfm_api.h"
#include "tfm_plat_test.h"
#include "test/suites/core/non_secure/core_test_api.h"
diff --git a/test/suites/sst/secure/nv_counters/test_sst_nv_counters.c b/test/suites/sst/secure/nv_counters/test_sst_nv_counters.c
index 113fb4a2fa..ec18eaa60d 100644
--- a/test/suites/sst/secure/nv_counters/test_sst_nv_counters.c
+++ b/test/suites/sst/secure/nv_counters/test_sst_nv_counters.c
@@ -8,8 +8,8 @@
#include "test_sst_nv_counters.h"
#include <limits.h>
-#include "secure_fw/services/secure_storage/nv_counters/sst_nv_counters.h"
-#include "secure_fw/services/secure_storage/sst_utils.h"
+#include "secure_fw/partitions/secure_storage/nv_counters/sst_nv_counters.h"
+#include "secure_fw/partitions/secure_storage/sst_utils.h"
#define DISABLE_INCREMENT 0
#define ENABLE_INCREMENT 1
diff --git a/test/suites/sst/secure/sst_rollback_protection_testsuite.c b/test/suites/sst/secure/sst_rollback_protection_testsuite.c
index fbcdc04d8f..bc9d19f106 100644
--- a/test/suites/sst/secure/sst_rollback_protection_testsuite.c
+++ b/test/suites/sst/secure/sst_rollback_protection_testsuite.c
@@ -9,7 +9,7 @@
#include <stdio.h>
-#include "secure_fw/services/secure_storage/nv_counters/sst_nv_counters.h"
+#include "secure_fw/partitions/secure_storage/nv_counters/sst_nv_counters.h"
#include "nv_counters/test_sst_nv_counters.h"
#include "psa/protected_storage.h"
#include "tfm_memory_utils.h"
diff --git a/test/test_services/CMakeLists.inc b/test/test_services/CMakeLists.inc
index c22a33b281..f5e52d981d 100644
--- a/test/test_services/CMakeLists.inc
+++ b/test/test_services/CMakeLists.inc
@@ -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
#
@@ -79,7 +79,7 @@ endif()
embedded_include_directories(PATH ${TFM_ROOT_DIR} ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/interface/include ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/platform/include ABSOLUTE)
-embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/core/include ABSOLUTE)
+embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/include ABSOLUTE)
set(BUILD_CMSIS_CORE Off)
set(BUILD_RETARGET Off)
diff --git a/test/test_services/tfm_core_test/core_test_defs.h b/test/test_services/tfm_core_test/core_test_defs.h
index f1e07fbb84..819d2a8d02 100644
--- a/test/test_services/tfm_core_test/core_test_defs.h
+++ b/test/test_services/tfm_core_test/core_test_defs.h
@@ -15,7 +15,6 @@ extern "C" {
#include <inttypes.h>
#include <limits.h>
#include "tfm_api.h"
-#include "tfm_core.h"
/* These definitions are used in symbols, only digits are permitted */
#define CORE_TEST_ID_NS_THREAD 1001
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 31dffa7099..0a6d85e71a 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
@@ -12,8 +12,8 @@
#include "tfm_veneers.h"
#include "secure_utilities.h"
#include "tfm_secure_api.h"
-#include "secure_fw/include/tfm_spm_services_api.h"
-#include "spm_partition_defs.h"
+#include "secure_fw/include/tfm/tfm_spm_services_api.h"
+#include "tfm/spm_partition_defs.h"
#include "psa/service.h"
#include "tfm_plat_test.h"
#include "psa_manifest/tfm_test_core.h"
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 a242f71022..18ea676b06 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
@@ -10,7 +10,7 @@
#include "tfm_ss_core_test_2.h"
#include "tfm_api.h"
#include "tfm_secure_api.h"
-#include "spm_partition_defs.h"
+#include "tfm/spm_partition_defs.h"
#include "psa/service.h"
#include "psa_manifest/tfm_test_core_2.h"
diff --git a/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.c b/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.c
index 168d2a9205..a8ffcf5d7e 100644
--- a/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.c
+++ b/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.c
@@ -10,8 +10,8 @@
#include "tfm_veneers.h"
#include "secure_utilities.h"
#include "tfm_secure_api.h"
-#include "secure_fw/include/tfm_spm_services_api.h"
-#include "spm_partition_defs.h"
+#include "secure_fw/include/tfm/tfm_spm_services_api.h"
+#include "tfm/spm_partition_defs.h"
#include "test/test_services/tfm_core_test/core_test_defs.h"
#include "psa/service.h"
#include "psa_manifest/tfm_irq_test_service_1.h"
diff --git a/test/test_services/tfm_sst_test_service/tfm_sst_test_service.c b/test/test_services/tfm_sst_test_service/tfm_sst_test_service.c
index 94ec3a9566..0e43666728 100644
--- a/test/test_services/tfm_sst_test_service/tfm_sst_test_service.c
+++ b/test/test_services/tfm_sst_test_service/tfm_sst_test_service.c
@@ -12,7 +12,7 @@
#include "psa/client.h"
#endif
-#include "secure_fw/services/secure_storage/sst_object_system.h"
+#include "secure_fw/partitions/secure_storage/sst_object_system.h"
psa_status_t tfm_sst_test_prepare(psa_invec *in_vec, size_t in_len,
psa_outvec *out_vec, size_t out_len)