Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame] | 1 | From dfadca01ff028f9fc935937cdaf92b0effff2b90 Mon Sep 17 00:00:00 2001 |
| 2 | From: Gyorgy Szing <Gyorgy.Szing@arm.com> |
| 3 | Date: Wed, 20 Jul 2022 16:49:39 +0000 |
| 4 | Subject: [PATCH] Adapt deployments to libts changes |
| 5 | |
| 6 | Update deployments and restore compatibility to libts build-system |
| 7 | interface changes. |
| 8 | |
| 9 | Signed-off-by: Gyorgy Szing <Gyorgy.Szing@arm.com> |
| 10 | Change-Id: Iffd38f92fe628a2a6aaff60224986f22ec3a8a2a |
| 11 | |
| 12 | Upstream-Status: Pending [In review] |
| 13 | Signed-off-by: Anton Antonov <Anton.Antonov@arm.com> |
| 14 | |
| 15 | --- |
| 16 | |
| 17 | diff --git a/deployments/platform-inspect/platform-inspect.cmake b/deployments/platform-inspect/platform-inspect.cmake |
| 18 | index ef4ba4b..b1b316d 100644 |
| 19 | --- a/deployments/platform-inspect/platform-inspect.cmake |
| 20 | +++ b/deployments/platform-inspect/platform-inspect.cmake |
| 21 | @@ -1,5 +1,5 @@ |
| 22 | #------------------------------------------------------------------------------- |
| 23 | -# Copyright (c) 2021, Arm Limited and Contributors. All rights reserved. |
| 24 | +# Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved. |
| 25 | # |
| 26 | # SPDX-License-Identifier: BSD-3-Clause |
| 27 | # |
| 28 | @@ -12,14 +12,14 @@ |
| 29 | |
| 30 | #------------------------------------------------------------------------------- |
| 31 | # Use libts for locating and accessing trusted services. An appropriate version |
| 32 | -# of libts will be imported for the enviroment in which platform-inspect is |
| 33 | +# of libts will be imported for the environment in which platform-inspect is |
| 34 | # built. |
| 35 | #------------------------------------------------------------------------------- |
| 36 | include(${TS_ROOT}/deployments/libts/libts-import.cmake) |
| 37 | -target_link_libraries(platform-inspect PRIVATE libts) |
| 38 | +target_link_libraries(platform-inspect PRIVATE libts::ts) |
| 39 | |
| 40 | #------------------------------------------------------------------------------- |
| 41 | -# Components that are common accross all deployments |
| 42 | +# Components that are common across all deployments |
| 43 | # |
| 44 | #------------------------------------------------------------------------------- |
| 45 | add_components( |
| 46 | diff --git a/deployments/psa-api-test/psa-api-test.cmake b/deployments/psa-api-test/psa-api-test.cmake |
| 47 | index d58620f..5c3469c 100644 |
| 48 | --- a/deployments/psa-api-test/psa-api-test.cmake |
| 49 | +++ b/deployments/psa-api-test/psa-api-test.cmake |
| 50 | @@ -1,5 +1,5 @@ |
| 51 | #------------------------------------------------------------------------------- |
| 52 | -# Copyright (c) 2021, Arm Limited and Contributors. All rights reserved. |
| 53 | +# Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved. |
| 54 | # |
| 55 | # SPDX-License-Identifier: BSD-3-Clause |
| 56 | # |
| 57 | @@ -12,14 +12,14 @@ |
| 58 | |
| 59 | #------------------------------------------------------------------------------- |
| 60 | # Use libts for locating and accessing services. An appropriate version of |
| 61 | -# libts will be imported for the enviroment in which service tests are |
| 62 | +# libts will be imported for the environment in which service tests are |
| 63 | # deployed. |
| 64 | #------------------------------------------------------------------------------- |
| 65 | include(${TS_ROOT}/deployments/libts/libts-import.cmake) |
| 66 | -target_link_libraries(${PROJECT_NAME} PRIVATE libts) |
| 67 | +target_link_libraries(${PROJECT_NAME} PRIVATE libts::ts) |
| 68 | |
| 69 | #------------------------------------------------------------------------------- |
| 70 | -# Components that are common accross all deployments |
| 71 | +# Components that are common across all deployments |
| 72 | # |
| 73 | #------------------------------------------------------------------------------- |
| 74 | add_components( |
| 75 | diff --git a/deployments/ts-demo/ts-demo.cmake b/deployments/ts-demo/ts-demo.cmake |
| 76 | index 3e7cca0..9fd8585 100644 |
| 77 | --- a/deployments/ts-demo/ts-demo.cmake |
| 78 | +++ b/deployments/ts-demo/ts-demo.cmake |
| 79 | @@ -1,5 +1,5 @@ |
| 80 | #------------------------------------------------------------------------------- |
| 81 | -# Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved. |
| 82 | +# Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved. |
| 83 | # |
| 84 | # SPDX-License-Identifier: BSD-3-Clause |
| 85 | # |
| 86 | @@ -13,11 +13,11 @@ |
| 87 | |
| 88 | #------------------------------------------------------------------------------- |
| 89 | # Use libts for locating and accessing services. An appropriate version of |
| 90 | -# libts will be imported for the enviroment in which service tests are |
| 91 | +# libts will be imported for the environment in which service tests are |
| 92 | # deployed. |
| 93 | #------------------------------------------------------------------------------- |
| 94 | include(${TS_ROOT}/deployments/libts/libts-import.cmake) |
| 95 | -target_link_libraries(ts-demo PRIVATE libts) |
| 96 | +target_link_libraries(ts-demo PRIVATE libts::ts) |
| 97 | |
| 98 | #------------------------------------------------------------------------------- |
| 99 | # Common main for all deployments |
| 100 | @@ -28,7 +28,7 @@ |
| 101 | ) |
| 102 | |
| 103 | #------------------------------------------------------------------------------- |
| 104 | -# Components that are common accross all deployments |
| 105 | +# Components that are common across all deployments |
| 106 | # |
| 107 | #------------------------------------------------------------------------------- |
| 108 | add_components( |
| 109 | diff --git a/deployments/ts-remote-test/ts-remote-test.cmake b/deployments/ts-remote-test/ts-remote-test.cmake |
| 110 | index 0f35bb2..c310445 100644 |
| 111 | --- a/deployments/ts-remote-test/ts-remote-test.cmake |
| 112 | +++ b/deployments/ts-remote-test/ts-remote-test.cmake |
| 113 | @@ -1,5 +1,5 @@ |
| 114 | #------------------------------------------------------------------------------- |
| 115 | -# Copyright (c) 2021, Arm Limited and Contributors. All rights reserved. |
| 116 | +# Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved. |
| 117 | # |
| 118 | # SPDX-License-Identifier: BSD-3-Clause |
| 119 | # |
| 120 | @@ -13,11 +13,11 @@ |
| 121 | |
| 122 | #------------------------------------------------------------------------------- |
| 123 | # Use libts for locating and accessing services. An appropriate version of |
| 124 | -# libts will be imported for the enviroment in which tests are |
| 125 | +# libts will be imported for the environment in which tests are |
| 126 | # deployed. |
| 127 | #------------------------------------------------------------------------------- |
| 128 | include(${TS_ROOT}/deployments/libts/libts-import.cmake) |
| 129 | -target_link_libraries(ts-remote-test PRIVATE libts) |
| 130 | +target_link_libraries(ts-remote-test PRIVATE libts::ts) |
| 131 | |
| 132 | #------------------------------------------------------------------------------- |
| 133 | # Common main for all deployments |
| 134 | @@ -28,7 +28,7 @@ |
| 135 | ) |
| 136 | |
| 137 | #------------------------------------------------------------------------------- |
| 138 | -# Components that are common accross all deployments |
| 139 | +# Components that are common across all deployments |
| 140 | # |
| 141 | #------------------------------------------------------------------------------- |
| 142 | add_components( |
| 143 | diff --git a/deployments/ts-service-test/ts-service-test.cmake b/deployments/ts-service-test/ts-service-test.cmake |
| 144 | index 4a8c59c..3e33757 100644 |
| 145 | --- a/deployments/ts-service-test/ts-service-test.cmake |
| 146 | +++ b/deployments/ts-service-test/ts-service-test.cmake |
| 147 | @@ -1,5 +1,5 @@ |
| 148 | #------------------------------------------------------------------------------- |
| 149 | -# Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved. |
| 150 | +# Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved. |
| 151 | # |
| 152 | # SPDX-License-Identifier: BSD-3-Clause |
| 153 | # |
| 154 | @@ -8,19 +8,19 @@ |
| 155 | #------------------------------------------------------------------------------- |
| 156 | # The base build file shared between deployments of 'ts-service-test' for |
| 157 | # different environments. Used for running end-to-end service-level tests |
| 158 | -# where test cases excerise trusted service client interfaces. |
| 159 | +# where test cases exercise trusted service client interfaces. |
| 160 | #------------------------------------------------------------------------------- |
| 161 | |
| 162 | #------------------------------------------------------------------------------- |
| 163 | # Use libts for locating and accessing services. An appropriate version of |
| 164 | -# libts will be imported for the enviroment in which service tests are |
| 165 | +# libts will be imported for the environment in which service tests are |
| 166 | # deployed. |
| 167 | #------------------------------------------------------------------------------- |
| 168 | include(${TS_ROOT}/deployments/libts/libts-import.cmake) |
| 169 | -target_link_libraries(ts-service-test PRIVATE libts) |
| 170 | +target_link_libraries(ts-service-test PRIVATE libts::ts) |
| 171 | |
| 172 | #------------------------------------------------------------------------------- |
| 173 | -# Components that are common accross all deployments |
| 174 | +# Components that are common across all deployments |
| 175 | # |
| 176 | #------------------------------------------------------------------------------- |
| 177 | add_components( |
| 178 | diff --git a/deployments/uefi-test/uefi-test.cmake b/deployments/uefi-test/uefi-test.cmake |
| 179 | index ea678d0..2f47891 100644 |
| 180 | --- a/deployments/uefi-test/uefi-test.cmake |
| 181 | +++ b/deployments/uefi-test/uefi-test.cmake |
| 182 | @@ -1,5 +1,5 @@ |
| 183 | #------------------------------------------------------------------------------- |
| 184 | -# Copyright (c) 2021, Arm Limited and Contributors. All rights reserved. |
| 185 | +# Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved. |
| 186 | # |
| 187 | # SPDX-License-Identifier: BSD-3-Clause |
| 188 | # |
| 189 | @@ -18,7 +18,7 @@ |
| 190 | # deployed. |
| 191 | #------------------------------------------------------------------------------- |
| 192 | include(${TS_ROOT}/deployments/libts/libts-import.cmake) |
| 193 | -target_link_libraries(uefi-test PRIVATE libts) |
| 194 | +target_link_libraries(uefi-test PRIVATE libts::ts) |
| 195 | |
| 196 | #------------------------------------------------------------------------------- |
| 197 | # Components that are common accross all deployments |