Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 92b42cb35d755f8cfe6c17d403711a536e0f0721 / . / meta-arm / meta-arm / recipes-security / trusted-services / files / 0017-Move-libsp-mocks-into-separate-component.patch
blob: d6da370a26978b13184d5f0087281da981d46cb1 [file] [log] [blame]
Patrick Williams92b42cb2022-09-03 06:53:57 -0500[diff] [blame^]1From 2cd802030ab59787a34c0f6684c16848befabafa Mon Sep 17 00:00:00 2001
2From: Imre Kis <imre.kis@arm.com>
3Date: Wed, 15 Jun 2022 12:47:37 +0200
4Subject: [PATCH 17/24] Move libsp mocks into separate component
5
6Enable deployments to include libsp mocks in tests by simply adding
7the newly created libsp mock component.
8
9Signed-off-by: Imre Kis <imre.kis@arm.com>
10Change-Id: I40805fd49362c6cc71b5b34f9ba888d27ce01ed8
11
12Upstream-Status: Pending [In review]
13Signed-off-by: Anton Antonov <Anton.Antonov@arm.com>
14
15---
16 .../messaging/ffa/libsp/mock/component.cmake | 27 ++++++++++
17 .../ffa/libsp/{test => mock}/mock_assert.cpp | 0
18 .../ffa/libsp/{test => mock}/mock_assert.h | 0
19 .../ffa/libsp/{test => mock}/mock_ffa_api.cpp | 0
20 .../ffa/libsp/{test => mock}/mock_ffa_api.h | 0
21 .../{test => mock}/mock_ffa_internal_api.cpp | 0
22 .../{test => mock}/mock_ffa_internal_api.h | 0
23 .../ffa/libsp/{test => mock}/mock_sp_rxtx.cpp | 0
24 .../ffa/libsp/{test => mock}/mock_sp_rxtx.h | 0
25 .../{ => mock}/test/test_mock_assert.cpp | 0
26 .../{ => mock}/test/test_mock_ffa_api.cpp | 0
27 .../test/test_mock_ffa_internal_api.cpp | 0
28 .../{ => mock}/test/test_mock_sp_rxtx.cpp | 0
29 components/messaging/ffa/libsp/tests.cmake | 51 +++++++++++--------
30 .../mm_communicate/endpoint/sp/tests.cmake | 6 +--
31 .../frontend/mm_communicate/tests.cmake | 6 +--
32 16 files changed, 64 insertions(+), 26 deletions(-)
33 create mode 100644 components/messaging/ffa/libsp/mock/component.cmake
34 rename components/messaging/ffa/libsp/{test => mock}/mock_assert.cpp (100%)
35 rename components/messaging/ffa/libsp/{test => mock}/mock_assert.h (100%)
36 rename components/messaging/ffa/libsp/{test => mock}/mock_ffa_api.cpp (100%)
37 rename components/messaging/ffa/libsp/{test => mock}/mock_ffa_api.h (100%)
38 rename components/messaging/ffa/libsp/{test => mock}/mock_ffa_internal_api.cpp (100%)
39 rename components/messaging/ffa/libsp/{test => mock}/mock_ffa_internal_api.h (100%)
40 rename components/messaging/ffa/libsp/{test => mock}/mock_sp_rxtx.cpp (100%)
41 rename components/messaging/ffa/libsp/{test => mock}/mock_sp_rxtx.h (100%)
42 rename components/messaging/ffa/libsp/{ => mock}/test/test_mock_assert.cpp (100%)
43 rename components/messaging/ffa/libsp/{ => mock}/test/test_mock_ffa_api.cpp (100%)
44 rename components/messaging/ffa/libsp/{ => mock}/test/test_mock_ffa_internal_api.cpp (100%)
45 rename components/messaging/ffa/libsp/{ => mock}/test/test_mock_sp_rxtx.cpp (100%)
46
47diff --git a/components/messaging/ffa/libsp/mock/component.cmake b/components/messaging/ffa/libsp/mock/component.cmake
48new file mode 100644
49index 0000000..03b8006
50--- /dev/null
51+++ b/components/messaging/ffa/libsp/mock/component.cmake
52@@ -0,0 +1,27 @@
53+#-------------------------------------------------------------------------------
54+# Copyright (c) 2022, Arm Limited and Contributors. All rights reserved.
55+#
56+# SPDX-License-Identifier: BSD-3-Clause
57+#
58+#-------------------------------------------------------------------------------
59+if (NOT DEFINED TGT)
60+ message(FATAL_ERROR "mandatory parameter TGT is not defined.")
61+endif()
62+
63+target_sources(${TGT} PRIVATE
64+ "${CMAKE_CURRENT_LIST_DIR}/mock_assert.cpp"
65+ "${CMAKE_CURRENT_LIST_DIR}/mock_ffa_api.cpp"
66+ "${CMAKE_CURRENT_LIST_DIR}/mock_ffa_internal_api.cpp"
67+ "${CMAKE_CURRENT_LIST_DIR}/mock_sp_rxtx.cpp"
68+ )
69+
70+target_include_directories(${TGT}
71+ PUBLIC
72+ ${CMAKE_CURRENT_LIST_DIR}
73+ ${CMAKE_CURRENT_LIST_DIR}/../include
74+)
75+
76+target_compile_definitions(${TGT}
77+ PUBLIC
78+ "ARM64=1"
79+)
80\ No newline at end of file
81diff --git a/components/messaging/ffa/libsp/test/mock_assert.cpp b/components/messaging/ffa/libsp/mock/mock_assert.cpp
82similarity index 100%
83rename from components/messaging/ffa/libsp/test/mock_assert.cpp
84rename to components/messaging/ffa/libsp/mock/mock_assert.cpp
85diff --git a/components/messaging/ffa/libsp/test/mock_assert.h b/components/messaging/ffa/libsp/mock/mock_assert.h
86similarity index 100%
87rename from components/messaging/ffa/libsp/test/mock_assert.h
88rename to components/messaging/ffa/libsp/mock/mock_assert.h
89diff --git a/components/messaging/ffa/libsp/test/mock_ffa_api.cpp b/components/messaging/ffa/libsp/mock/mock_ffa_api.cpp
90similarity index 100%
91rename from components/messaging/ffa/libsp/test/mock_ffa_api.cpp
92rename to components/messaging/ffa/libsp/mock/mock_ffa_api.cpp
93diff --git a/components/messaging/ffa/libsp/test/mock_ffa_api.h b/components/messaging/ffa/libsp/mock/mock_ffa_api.h
94similarity index 100%
95rename from components/messaging/ffa/libsp/test/mock_ffa_api.h
96rename to components/messaging/ffa/libsp/mock/mock_ffa_api.h
97diff --git a/components/messaging/ffa/libsp/test/mock_ffa_internal_api.cpp b/components/messaging/ffa/libsp/mock/mock_ffa_internal_api.cpp
98similarity index 100%
99rename from components/messaging/ffa/libsp/test/mock_ffa_internal_api.cpp
100rename to components/messaging/ffa/libsp/mock/mock_ffa_internal_api.cpp
101diff --git a/components/messaging/ffa/libsp/test/mock_ffa_internal_api.h b/components/messaging/ffa/libsp/mock/mock_ffa_internal_api.h
102similarity index 100%
103rename from components/messaging/ffa/libsp/test/mock_ffa_internal_api.h
104rename to components/messaging/ffa/libsp/mock/mock_ffa_internal_api.h
105diff --git a/components/messaging/ffa/libsp/test/mock_sp_rxtx.cpp b/components/messaging/ffa/libsp/mock/mock_sp_rxtx.cpp
106similarity index 100%
107rename from components/messaging/ffa/libsp/test/mock_sp_rxtx.cpp
108rename to components/messaging/ffa/libsp/mock/mock_sp_rxtx.cpp
109diff --git a/components/messaging/ffa/libsp/test/mock_sp_rxtx.h b/components/messaging/ffa/libsp/mock/mock_sp_rxtx.h
110similarity index 100%
111rename from components/messaging/ffa/libsp/test/mock_sp_rxtx.h
112rename to components/messaging/ffa/libsp/mock/mock_sp_rxtx.h
113diff --git a/components/messaging/ffa/libsp/test/test_mock_assert.cpp b/components/messaging/ffa/libsp/mock/test/test_mock_assert.cpp
114similarity index 100%
115rename from components/messaging/ffa/libsp/test/test_mock_assert.cpp
116rename to components/messaging/ffa/libsp/mock/test/test_mock_assert.cpp
117diff --git a/components/messaging/ffa/libsp/test/test_mock_ffa_api.cpp b/components/messaging/ffa/libsp/mock/test/test_mock_ffa_api.cpp
118similarity index 100%
119rename from components/messaging/ffa/libsp/test/test_mock_ffa_api.cpp
120rename to components/messaging/ffa/libsp/mock/test/test_mock_ffa_api.cpp
121diff --git a/components/messaging/ffa/libsp/test/test_mock_ffa_internal_api.cpp b/components/messaging/ffa/libsp/mock/test/test_mock_ffa_internal_api.cpp
122similarity index 100%
123rename from components/messaging/ffa/libsp/test/test_mock_ffa_internal_api.cpp
124rename to components/messaging/ffa/libsp/mock/test/test_mock_ffa_internal_api.cpp
125diff --git a/components/messaging/ffa/libsp/test/test_mock_sp_rxtx.cpp b/components/messaging/ffa/libsp/mock/test/test_mock_sp_rxtx.cpp
126similarity index 100%
127rename from components/messaging/ffa/libsp/test/test_mock_sp_rxtx.cpp
128rename to components/messaging/ffa/libsp/mock/test/test_mock_sp_rxtx.cpp
129diff --git a/components/messaging/ffa/libsp/tests.cmake b/components/messaging/ffa/libsp/tests.cmake
130index d851442..296ae46 100644
131--- a/components/messaging/ffa/libsp/tests.cmake
132+++ b/components/messaging/ffa/libsp/tests.cmake
133@@ -1,5 +1,5 @@
134 #
135-# Copyright (c) 2020-2021, Arm Limited. All rights reserved.
136+# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
137 #
138 # SPDX-License-Identifier: BSD-3-Clause
139 #
140@@ -9,10 +9,11 @@ include(UnitTest)
141 unit_test_add_suite(
142 NAME libsp_mock_assert
143 SOURCES
144- ${CMAKE_CURRENT_LIST_DIR}/test/mock_assert.cpp
145- ${CMAKE_CURRENT_LIST_DIR}/test/test_mock_assert.cpp
146+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_assert.cpp
147+ ${CMAKE_CURRENT_LIST_DIR}/mock/test/test_mock_assert.cpp
148 INCLUDE_DIRECTORIES
149 ${CMAKE_CURRENT_LIST_DIR}/include/
150+ ${CMAKE_CURRENT_LIST_DIR}/mock
151 ${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
152 COMPILE_DEFINITIONS
153 -DARM64
154@@ -21,10 +22,11 @@ unit_test_add_suite(
155 unit_test_add_suite(
156 NAME libsp_mock_ffa_internal_api
157 SOURCES
158- ${CMAKE_CURRENT_LIST_DIR}/test/mock_ffa_internal_api.cpp
159- ${CMAKE_CURRENT_LIST_DIR}/test/test_mock_ffa_internal_api.cpp
160+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_ffa_internal_api.cpp
161+ ${CMAKE_CURRENT_LIST_DIR}/mock/test/test_mock_ffa_internal_api.cpp
162 INCLUDE_DIRECTORIES
163 ${CMAKE_CURRENT_LIST_DIR}/include/
164+ ${CMAKE_CURRENT_LIST_DIR}/mock
165 ${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
166 COMPILE_DEFINITIONS
167 -DARM64
168@@ -35,12 +37,13 @@ unit_test_add_suite(
169 SOURCES
170 ${CMAKE_CURRENT_LIST_DIR}/test/test_ffa_api.cpp
171 ${CMAKE_CURRENT_LIST_DIR}/test/test_ffa_memory_descriptors.cpp
172- ${CMAKE_CURRENT_LIST_DIR}/test/mock_ffa_internal_api.cpp
173+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_ffa_internal_api.cpp
174 ${CMAKE_CURRENT_LIST_DIR}/ffa.c
175 ${CMAKE_CURRENT_LIST_DIR}/ffa_memory_descriptors.c
176- ${CMAKE_CURRENT_LIST_DIR}/test/mock_assert.cpp
177+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_assert.cpp
178 INCLUDE_DIRECTORIES
179 ${CMAKE_CURRENT_LIST_DIR}/include/
180+ ${CMAKE_CURRENT_LIST_DIR}/mock
181 ${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
182 COMPILE_DEFINITIONS
183 -DARM64
184@@ -49,10 +52,11 @@ unit_test_add_suite(
185 unit_test_add_suite(
186 NAME libsp_mock_ffa_api
187 SOURCES
188- ${CMAKE_CURRENT_LIST_DIR}/test/test_mock_ffa_api.cpp
189- ${CMAKE_CURRENT_LIST_DIR}/test/mock_ffa_api.cpp
190+ ${CMAKE_CURRENT_LIST_DIR}/mock/test/test_mock_ffa_api.cpp
191+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_ffa_api.cpp
192 INCLUDE_DIRECTORIES
193 ${CMAKE_CURRENT_LIST_DIR}/include/
194+ ${CMAKE_CURRENT_LIST_DIR}/mock
195 ${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
196 COMPILE_DEFINITIONS
197 -DARM64
198@@ -62,10 +66,11 @@ unit_test_add_suite(
199 NAME libsp_sp_rxtx
200 SOURCES
201 ${CMAKE_CURRENT_LIST_DIR}/test/test_sp_rxtx.cpp
202- ${CMAKE_CURRENT_LIST_DIR}/test/mock_ffa_api.cpp
203+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_ffa_api.cpp
204 ${CMAKE_CURRENT_LIST_DIR}/sp_rxtx.c
205 INCLUDE_DIRECTORIES
206 ${CMAKE_CURRENT_LIST_DIR}/include/
207+ ${CMAKE_CURRENT_LIST_DIR}/mock
208 ${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
209 COMPILE_DEFINITIONS
210 -DARM64
211@@ -74,10 +79,11 @@ unit_test_add_suite(
212 unit_test_add_suite(
213 NAME libsp_mock_sp_rxtx
214 SOURCES
215- ${CMAKE_CURRENT_LIST_DIR}/test/test_mock_sp_rxtx.cpp
216- ${CMAKE_CURRENT_LIST_DIR}/test/mock_sp_rxtx.cpp
217+ ${CMAKE_CURRENT_LIST_DIR}/mock/test/test_mock_sp_rxtx.cpp
218+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_sp_rxtx.cpp
219 INCLUDE_DIRECTORIES
220 ${CMAKE_CURRENT_LIST_DIR}/include/
221+ ${CMAKE_CURRENT_LIST_DIR}/mock
222 ${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
223 COMPILE_DEFINITIONS
224 -DARM64
225@@ -88,10 +94,11 @@ unit_test_add_suite(
226 SOURCES
227 ${CMAKE_CURRENT_LIST_DIR}/test/test_sp_discovery.cpp
228 ${CMAKE_CURRENT_LIST_DIR}/sp_discovery.c
229- ${CMAKE_CURRENT_LIST_DIR}/test/mock_ffa_api.cpp
230- ${CMAKE_CURRENT_LIST_DIR}/test/mock_sp_rxtx.cpp
231+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_ffa_api.cpp
232+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_sp_rxtx.cpp
233 INCLUDE_DIRECTORIES
234 ${CMAKE_CURRENT_LIST_DIR}/include/
235+ ${CMAKE_CURRENT_LIST_DIR}/mock
236 ${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
237 COMPILE_DEFINITIONS
238 -DARM64
239@@ -103,11 +110,12 @@ unit_test_add_suite(
240 ${CMAKE_CURRENT_LIST_DIR}/test/test_sp_memory_management.cpp
241 ${CMAKE_CURRENT_LIST_DIR}/sp_memory_management.c
242 ${CMAKE_CURRENT_LIST_DIR}/ffa_memory_descriptors.c
243- ${CMAKE_CURRENT_LIST_DIR}/test/mock_assert.cpp
244- ${CMAKE_CURRENT_LIST_DIR}/test/mock_ffa_api.cpp
245- ${CMAKE_CURRENT_LIST_DIR}/test/mock_sp_rxtx.cpp
246+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_assert.cpp
247+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_ffa_api.cpp
248+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_sp_rxtx.cpp
249 INCLUDE_DIRECTORIES
250 ${CMAKE_CURRENT_LIST_DIR}/include/
251+ ${CMAKE_CURRENT_LIST_DIR}/mock
252 ${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
253 COMPILE_DEFINITIONS
254 -DARM64
255@@ -119,9 +127,10 @@ unit_test_add_suite(
256 ${CMAKE_CURRENT_LIST_DIR}/test/test_sp_memory_management_internals.cpp
257 ${CMAKE_CURRENT_LIST_DIR}/test/sp_memory_management_internals.yml
258 ${CMAKE_CURRENT_LIST_DIR}/ffa_memory_descriptors.c
259- ${CMAKE_CURRENT_LIST_DIR}/test/mock_assert.cpp
260+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_assert.cpp
261 INCLUDE_DIRECTORIES
262 ${CMAKE_CURRENT_LIST_DIR}/include/
263+ ${CMAKE_CURRENT_LIST_DIR}/mock
264 ${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
265 COMPILE_DEFINITIONS
266 -DARM64
267@@ -131,10 +140,11 @@ unit_test_add_suite(
268 NAME libsp_sp_messaging
269 SOURCES
270 ${CMAKE_CURRENT_LIST_DIR}/test/test_sp_messaging.cpp
271- ${CMAKE_CURRENT_LIST_DIR}/test/mock_ffa_api.cpp
272+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_ffa_api.cpp
273 ${CMAKE_CURRENT_LIST_DIR}/sp_messaging.c
274 INCLUDE_DIRECTORIES
275 ${CMAKE_CURRENT_LIST_DIR}/include/
276+ ${CMAKE_CURRENT_LIST_DIR}/mock
277 ${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
278 COMPILE_DEFINITIONS
279 -DARM64
280@@ -144,11 +154,12 @@ unit_test_add_suite(
281 NAME libsp_sp_messaging_with_routing_extension
282 SOURCES
283 ${CMAKE_CURRENT_LIST_DIR}/test/test_sp_messaging.cpp
284- ${CMAKE_CURRENT_LIST_DIR}/test/mock_ffa_api.cpp
285+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_ffa_api.cpp
286 ${CMAKE_CURRENT_LIST_DIR}/sp_messaging.c
287 ${CMAKE_CURRENT_LIST_DIR}/ffa_direct_msg_routing_extension.c
288 INCLUDE_DIRECTORIES
289 ${CMAKE_CURRENT_LIST_DIR}/include/
290+ ${CMAKE_CURRENT_LIST_DIR}/mock
291 ${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
292 COMPILE_DEFINITIONS
293 -DARM64
294diff --git a/components/rpc/mm_communicate/endpoint/sp/tests.cmake b/components/rpc/mm_communicate/endpoint/sp/tests.cmake
295index 318f14d..c68a0c7 100644
296--- a/components/rpc/mm_communicate/endpoint/sp/tests.cmake
297+++ b/components/rpc/mm_communicate/endpoint/sp/tests.cmake
298@@ -1,5 +1,5 @@
299 #
300-# Copyright (c) 2021, Arm Limited. All rights reserved.
301+# Copyright (c) 2021-2022, Arm Limited. All rights reserved.
302 #
303 # SPDX-License-Identifier: BSD-3-Clause
304 #
305@@ -13,12 +13,12 @@ unit_test_add_suite(
306 ${CMAKE_CURRENT_LIST_DIR}/test/test_mm_communicate_call_ep.cpp
307 ${CMAKE_CURRENT_LIST_DIR}/test/mock_mm_service.cpp
308 ${CMAKE_CURRENT_LIST_DIR}/test/test_mock_mm_service.cpp
309- ${UNIT_TEST_PROJECT_PATH}/components/messaging/ffa/libsp/test/mock_assert.cpp
310+ ${UNIT_TEST_PROJECT_PATH}/components/messaging/ffa/libsp/mock/mock_assert.cpp
311 INCLUDE_DIRECTORIES
312 ${UNIT_TEST_PROJECT_PATH}
313 ${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
314 ${UNIT_TEST_PROJECT_PATH}/components/messaging/ffa/libsp/include
315- ${UNIT_TEST_PROJECT_PATH}/components/messaging/ffa/libsp/test
316+ ${UNIT_TEST_PROJECT_PATH}/components/messaging/ffa/libsp/mock
317 ${UNIT_TEST_PROJECT_PATH}/components/rpc/common/interface
318 COMPILE_DEFINITIONS
319 -DARM64
320diff --git a/components/service/smm_variable/frontend/mm_communicate/tests.cmake b/components/service/smm_variable/frontend/mm_communicate/tests.cmake
321index d1f930c..50b0b9a 100644
322--- a/components/service/smm_variable/frontend/mm_communicate/tests.cmake
323+++ b/components/service/smm_variable/frontend/mm_communicate/tests.cmake
324@@ -1,5 +1,5 @@
325 #
326-# Copyright (c) 2021, Arm Limited. All rights reserved.
327+# Copyright (c) 2021-2022, Arm Limited. All rights reserved.
328 #
329 # SPDX-License-Identifier: BSD-3-Clause
330 #
331@@ -12,13 +12,13 @@ unit_test_add_suite(
332 ${CMAKE_CURRENT_LIST_DIR}/smm_variable_mm_service.c
333 ${CMAKE_CURRENT_LIST_DIR}/test/test_smm_variable_mm_service.cpp
334 ${UNIT_TEST_PROJECT_PATH}/components/rpc/common/test/mock_rpc_interface.cpp
335- ${UNIT_TEST_PROJECT_PATH}/components/messaging/ffa/libsp/test/mock_assert.cpp
336+ ${UNIT_TEST_PROJECT_PATH}/components/messaging/ffa/libsp/mock/mock_assert.cpp
337 INCLUDE_DIRECTORIES
338 ${UNIT_TEST_PROJECT_PATH}
339 ${UNIT_TEST_PROJECT_PATH}/components/rpc/mm_communicate/endpoint/sp
340 ${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
341 ${UNIT_TEST_PROJECT_PATH}/components/messaging/ffa/libsp/include
342- ${UNIT_TEST_PROJECT_PATH}/components/messaging/ffa/libsp/test
343+ ${UNIT_TEST_PROJECT_PATH}/components/messaging/ffa/libsp/mock
344 ${UNIT_TEST_PROJECT_PATH}/components/rpc/common/interface
345 COMPILE_DEFINITIONS
346 -DARM64
347--
3482.17.1
349