diff options
author | Jaykumar Pitambarbhai Patel <jay08ec71@yahoo.com> | 2020-02-05 23:27:08 +0530 |
---|---|---|
committer | Jaykumar Pitambarbhai Patel <jaykumar.pitambarbhaipatel@arm.com> | 2020-02-20 14:42:36 +0530 |
commit | 33311d3ff1e888b7b4a8de991b7cab77fece6710 (patch) | |
tree | 64fd002c5485004cf1f0133eeaeedfd88e0e27bf /test | |
parent | b0f92af500fead79ae5ce0327150e5e4eb19ccf2 (diff) | |
download | trusted-firmware-m-33311d3ff1e888b7b4a8de991b7cab77fece6710.tar.gz |
Tools: Add linker_pattern support to manifest list file
This change allows the PSA test suite partition manifest
parsing without any error for undefined linker_pattern
in manifest file as the linker_pattern support is now
added to manifest list file.
And move linker_pattern field from manifest to manifest_list
file for the existing SP manifest files.
Signed-off-by: Jaykumar Pitambarbhai Patel <jay08ec71@yahoo.com>
Change-Id: I85bb540feb100e494287cb845084b0026b04ace4
Diffstat (limited to 'test')
9 files changed, 8 insertions, 65 deletions
diff --git a/test/test_services/tfm_core_test/tfm_test_core.yaml b/test/test_services/tfm_core_test/tfm_test_core.yaml index 9d8a48c2ef..2127ef2961 100644 --- a/test/test_services/tfm_core_test/tfm_test_core.yaml +++ b/test/test_services/tfm_core_test/tfm_test_core.yaml @@ -41,11 +41,6 @@ "version_policy": "STRICT" } ], - "linker_pattern": { - "object_list": [ - "*tfm_ss_core_test.*" - ] - }, "services": [ { "name": "SPM_CORE_TEST_INIT_SUCCESS", diff --git a/test/test_services/tfm_core_test_2/tfm_test_core_2.yaml b/test/test_services/tfm_core_test_2/tfm_test_core_2.yaml index 7899a2f7ae..8b5d43cb6e 100644 --- a/test/test_services/tfm_core_test_2/tfm_test_core_2.yaml +++ b/test/test_services/tfm_core_test_2/tfm_test_core_2.yaml @@ -56,11 +56,6 @@ "version_policy": "STRICT" } ], - "linker_pattern": { - "object_list": [ - "*tfm_ss_core_test_2.*" - ] - }, "services": [ { "name": "SPM_CORE_TEST_2_SLAVE_SERVICE", diff --git a/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml b/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml index ef2487d1ec..e66139e9ec 100644 --- a/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml +++ b/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml @@ -56,10 +56,5 @@ "IPC_SERVICE_TEST_PSA_ACCESS_APP_MEM", "IPC_SERVICE_TEST_BASIC", "IPC_SERVICE_TEST_APP_ACCESS_PSA_MEM" - ], - "linker_pattern": { - "object_list": [ - "*ipc_client_test.*" - ] - } + ] } diff --git a/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml b/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml index 5d4a918e14..d06bddb96a 100644 --- a/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml +++ b/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------- -# Copyright (c) 2018-2019, Arm Limited. All rights reserved. +# Copyright (c) 2018-2020, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -50,10 +50,5 @@ "version": 1, "version_policy": "STRICT" } - ], - "linker_pattern": { - "object_list": [ - "*ipc_service_test.*" - ] - } + ] } diff --git a/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.yaml b/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.yaml index 36ca17879c..18256665e7 100644 --- a/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.yaml +++ b/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.yaml @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------- -# Copyright (c) 2019, Arm Limited. All rights reserved. +# Copyright (c) 2019-2020, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -41,12 +41,6 @@ "tfm_irq_priority": 64, } ], - "linker_pattern": { - "object_list": [ - "*tfm_irq_test_service_1.*", - "*timer_cmsdk*", - ] - }, "services": [ { "name": "SPM_CORE_IRQ_TEST_1_PREPARE_TEST_SCENARIO", diff --git a/test/test_services/tfm_multi_core_test/tfm_multi_core_test.yaml b/test/test_services/tfm_multi_core_test/tfm_multi_core_test.yaml index 43142f4afa..0b910bc03f 100644 --- a/test/test_services/tfm_multi_core_test/tfm_multi_core_test.yaml +++ b/test/test_services/tfm_multi_core_test/tfm_multi_core_test.yaml @@ -32,10 +32,5 @@ "minor_version": 1, "minor_policy": "STRICT" } - ], - "linker_pattern": { - "object_list": [ - "*multi_core_test.*" - ] - } + ] } diff --git a/test/test_services/tfm_secure_client_2/tfm_secure_client_2.yaml b/test/test_services/tfm_secure_client_2/tfm_secure_client_2.yaml index 29e32a88d9..33999338f2 100644 --- a/test/test_services/tfm_secure_client_2/tfm_secure_client_2.yaml +++ b/test/test_services/tfm_secure_client_2/tfm_secure_client_2.yaml @@ -33,10 +33,5 @@ "dependencies": [ "TFM_ITS_GET", "TFM_CRYPTO" - ], - "linker_pattern": { - "object_list": [ - "*tfm_secure_client_2.*" - ] - } + ] } diff --git a/test/test_services/tfm_secure_client_service/tfm_test_client_service.yaml b/test/test_services/tfm_secure_client_service/tfm_test_client_service.yaml index 1aa0f3eddd..4cd27c8c8c 100644 --- a/test/test_services/tfm_secure_client_service/tfm_test_client_service.yaml +++ b/test/test_services/tfm_secure_client_service/tfm_test_client_service.yaml @@ -54,21 +54,5 @@ "TFM_SST_TEST_PREPARE", "TFM_SP_PLATFORM_SYSTEM_RESET", "TFM_SP_PLATFORM_IOCTL" - ], -# Currently there is no platform dependent section of the manifest file, -# therefore all platform dependent files must be listed here which can be used -# on any supported platform. - "linker_pattern": { - "object_list": [ - "*tfm_secure_client_service.*", - "*test_framework*", - "*uart_stdout.*", - "*Driver_USART.*", - "*arm_uart_drv.*", # MPS2-AN521, MPS2-AN519 - "*uart_pl011_drv.*", # Musca-A, Musca-B1 - "*uart_cmsdk_drv*", # MPS3-AN524 - "*secure_suites.*", - "*attestation_s_interface_testsuite.*" - ] - } + ] } diff --git a/test/test_services/tfm_sst_test_service/tfm_sst_test_service.yaml b/test/test_services/tfm_sst_test_service/tfm_sst_test_service.yaml index 5e85396609..8294b17026 100644 --- a/test/test_services/tfm_sst_test_service/tfm_sst_test_service.yaml +++ b/test/test_services/tfm_sst_test_service/tfm_sst_test_service.yaml @@ -34,10 +34,5 @@ "TFM_CRYPTO", "TFM_ITS_GET", "TFM_ITS_REMOVE" - ], - "linker_pattern": { - "object_list": [ - "*tfm_sst_test_service.*", - ] - } + ] } |