Move libsp mocks into separate component
Enable deployments to include libsp mocks in tests by simply adding
the newly created libsp mock component.
Signed-off-by: Imre Kis <imre.kis@arm.com>
Change-Id: I40805fd49362c6cc71b5b34f9ba888d27ce01ed8
diff --git a/components/messaging/ffa/libsp/mock/component.cmake b/components/messaging/ffa/libsp/mock/component.cmake
new file mode 100644
index 0000000..03b8006
--- /dev/null
+++ b/components/messaging/ffa/libsp/mock/component.cmake
@@ -0,0 +1,27 @@
+#-------------------------------------------------------------------------------
+# Copyright (c) 2022, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+#-------------------------------------------------------------------------------
+if (NOT DEFINED TGT)
+ message(FATAL_ERROR "mandatory parameter TGT is not defined.")
+endif()
+
+target_sources(${TGT} PRIVATE
+ "${CMAKE_CURRENT_LIST_DIR}/mock_assert.cpp"
+ "${CMAKE_CURRENT_LIST_DIR}/mock_ffa_api.cpp"
+ "${CMAKE_CURRENT_LIST_DIR}/mock_ffa_internal_api.cpp"
+ "${CMAKE_CURRENT_LIST_DIR}/mock_sp_rxtx.cpp"
+ )
+
+target_include_directories(${TGT}
+ PUBLIC
+ ${CMAKE_CURRENT_LIST_DIR}
+ ${CMAKE_CURRENT_LIST_DIR}/../include
+)
+
+target_compile_definitions(${TGT}
+ PUBLIC
+ "ARM64=1"
+)
\ No newline at end of file
diff --git a/components/messaging/ffa/libsp/test/mock_assert.cpp b/components/messaging/ffa/libsp/mock/mock_assert.cpp
similarity index 100%
rename from components/messaging/ffa/libsp/test/mock_assert.cpp
rename to components/messaging/ffa/libsp/mock/mock_assert.cpp
diff --git a/components/messaging/ffa/libsp/test/mock_assert.h b/components/messaging/ffa/libsp/mock/mock_assert.h
similarity index 100%
rename from components/messaging/ffa/libsp/test/mock_assert.h
rename to components/messaging/ffa/libsp/mock/mock_assert.h
diff --git a/components/messaging/ffa/libsp/test/mock_ffa_api.cpp b/components/messaging/ffa/libsp/mock/mock_ffa_api.cpp
similarity index 100%
rename from components/messaging/ffa/libsp/test/mock_ffa_api.cpp
rename to components/messaging/ffa/libsp/mock/mock_ffa_api.cpp
diff --git a/components/messaging/ffa/libsp/test/mock_ffa_api.h b/components/messaging/ffa/libsp/mock/mock_ffa_api.h
similarity index 100%
rename from components/messaging/ffa/libsp/test/mock_ffa_api.h
rename to components/messaging/ffa/libsp/mock/mock_ffa_api.h
diff --git a/components/messaging/ffa/libsp/test/mock_ffa_internal_api.cpp b/components/messaging/ffa/libsp/mock/mock_ffa_internal_api.cpp
similarity index 100%
rename from components/messaging/ffa/libsp/test/mock_ffa_internal_api.cpp
rename to components/messaging/ffa/libsp/mock/mock_ffa_internal_api.cpp
diff --git a/components/messaging/ffa/libsp/test/mock_ffa_internal_api.h b/components/messaging/ffa/libsp/mock/mock_ffa_internal_api.h
similarity index 100%
rename from components/messaging/ffa/libsp/test/mock_ffa_internal_api.h
rename to components/messaging/ffa/libsp/mock/mock_ffa_internal_api.h
diff --git a/components/messaging/ffa/libsp/test/mock_sp_rxtx.cpp b/components/messaging/ffa/libsp/mock/mock_sp_rxtx.cpp
similarity index 100%
rename from components/messaging/ffa/libsp/test/mock_sp_rxtx.cpp
rename to components/messaging/ffa/libsp/mock/mock_sp_rxtx.cpp
diff --git a/components/messaging/ffa/libsp/test/mock_sp_rxtx.h b/components/messaging/ffa/libsp/mock/mock_sp_rxtx.h
similarity index 100%
rename from components/messaging/ffa/libsp/test/mock_sp_rxtx.h
rename to components/messaging/ffa/libsp/mock/mock_sp_rxtx.h
diff --git a/components/messaging/ffa/libsp/test/test_mock_assert.cpp b/components/messaging/ffa/libsp/mock/test/test_mock_assert.cpp
similarity index 100%
rename from components/messaging/ffa/libsp/test/test_mock_assert.cpp
rename to components/messaging/ffa/libsp/mock/test/test_mock_assert.cpp
diff --git a/components/messaging/ffa/libsp/test/test_mock_ffa_api.cpp b/components/messaging/ffa/libsp/mock/test/test_mock_ffa_api.cpp
similarity index 100%
rename from components/messaging/ffa/libsp/test/test_mock_ffa_api.cpp
rename to components/messaging/ffa/libsp/mock/test/test_mock_ffa_api.cpp
diff --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
similarity index 100%
rename from components/messaging/ffa/libsp/test/test_mock_ffa_internal_api.cpp
rename to components/messaging/ffa/libsp/mock/test/test_mock_ffa_internal_api.cpp
diff --git a/components/messaging/ffa/libsp/test/test_mock_sp_rxtx.cpp b/components/messaging/ffa/libsp/mock/test/test_mock_sp_rxtx.cpp
similarity index 100%
rename from components/messaging/ffa/libsp/test/test_mock_sp_rxtx.cpp
rename to components/messaging/ffa/libsp/mock/test/test_mock_sp_rxtx.cpp
diff --git a/components/messaging/ffa/libsp/tests.cmake b/components/messaging/ffa/libsp/tests.cmake
index d851442..296ae46 100644
--- a/components/messaging/ffa/libsp/tests.cmake
+++ b/components/messaging/ffa/libsp/tests.cmake
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2020-2021, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -9,10 +9,11 @@
unit_test_add_suite(
NAME libsp_mock_assert
SOURCES
- ${CMAKE_CURRENT_LIST_DIR}/test/mock_assert.cpp
- ${CMAKE_CURRENT_LIST_DIR}/test/test_mock_assert.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_assert.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/mock/test/test_mock_assert.cpp
INCLUDE_DIRECTORIES
${CMAKE_CURRENT_LIST_DIR}/include/
+ ${CMAKE_CURRENT_LIST_DIR}/mock
${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
COMPILE_DEFINITIONS
-DARM64
@@ -21,10 +22,11 @@
unit_test_add_suite(
NAME libsp_mock_ffa_internal_api
SOURCES
- ${CMAKE_CURRENT_LIST_DIR}/test/mock_ffa_internal_api.cpp
- ${CMAKE_CURRENT_LIST_DIR}/test/test_mock_ffa_internal_api.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_ffa_internal_api.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/mock/test/test_mock_ffa_internal_api.cpp
INCLUDE_DIRECTORIES
${CMAKE_CURRENT_LIST_DIR}/include/
+ ${CMAKE_CURRENT_LIST_DIR}/mock
${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
COMPILE_DEFINITIONS
-DARM64
@@ -35,12 +37,13 @@
SOURCES
${CMAKE_CURRENT_LIST_DIR}/test/test_ffa_api.cpp
${CMAKE_CURRENT_LIST_DIR}/test/test_ffa_memory_descriptors.cpp
- ${CMAKE_CURRENT_LIST_DIR}/test/mock_ffa_internal_api.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_ffa_internal_api.cpp
${CMAKE_CURRENT_LIST_DIR}/ffa.c
${CMAKE_CURRENT_LIST_DIR}/ffa_memory_descriptors.c
- ${CMAKE_CURRENT_LIST_DIR}/test/mock_assert.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_assert.cpp
INCLUDE_DIRECTORIES
${CMAKE_CURRENT_LIST_DIR}/include/
+ ${CMAKE_CURRENT_LIST_DIR}/mock
${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
COMPILE_DEFINITIONS
-DARM64
@@ -49,10 +52,11 @@
unit_test_add_suite(
NAME libsp_mock_ffa_api
SOURCES
- ${CMAKE_CURRENT_LIST_DIR}/test/test_mock_ffa_api.cpp
- ${CMAKE_CURRENT_LIST_DIR}/test/mock_ffa_api.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/mock/test/test_mock_ffa_api.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_ffa_api.cpp
INCLUDE_DIRECTORIES
${CMAKE_CURRENT_LIST_DIR}/include/
+ ${CMAKE_CURRENT_LIST_DIR}/mock
${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
COMPILE_DEFINITIONS
-DARM64
@@ -62,10 +66,11 @@
NAME libsp_sp_rxtx
SOURCES
${CMAKE_CURRENT_LIST_DIR}/test/test_sp_rxtx.cpp
- ${CMAKE_CURRENT_LIST_DIR}/test/mock_ffa_api.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_ffa_api.cpp
${CMAKE_CURRENT_LIST_DIR}/sp_rxtx.c
INCLUDE_DIRECTORIES
${CMAKE_CURRENT_LIST_DIR}/include/
+ ${CMAKE_CURRENT_LIST_DIR}/mock
${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
COMPILE_DEFINITIONS
-DARM64
@@ -74,10 +79,11 @@
unit_test_add_suite(
NAME libsp_mock_sp_rxtx
SOURCES
- ${CMAKE_CURRENT_LIST_DIR}/test/test_mock_sp_rxtx.cpp
- ${CMAKE_CURRENT_LIST_DIR}/test/mock_sp_rxtx.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/mock/test/test_mock_sp_rxtx.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_sp_rxtx.cpp
INCLUDE_DIRECTORIES
${CMAKE_CURRENT_LIST_DIR}/include/
+ ${CMAKE_CURRENT_LIST_DIR}/mock
${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
COMPILE_DEFINITIONS
-DARM64
@@ -88,10 +94,11 @@
SOURCES
${CMAKE_CURRENT_LIST_DIR}/test/test_sp_discovery.cpp
${CMAKE_CURRENT_LIST_DIR}/sp_discovery.c
- ${CMAKE_CURRENT_LIST_DIR}/test/mock_ffa_api.cpp
- ${CMAKE_CURRENT_LIST_DIR}/test/mock_sp_rxtx.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_ffa_api.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_sp_rxtx.cpp
INCLUDE_DIRECTORIES
${CMAKE_CURRENT_LIST_DIR}/include/
+ ${CMAKE_CURRENT_LIST_DIR}/mock
${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
COMPILE_DEFINITIONS
-DARM64
@@ -103,11 +110,12 @@
${CMAKE_CURRENT_LIST_DIR}/test/test_sp_memory_management.cpp
${CMAKE_CURRENT_LIST_DIR}/sp_memory_management.c
${CMAKE_CURRENT_LIST_DIR}/ffa_memory_descriptors.c
- ${CMAKE_CURRENT_LIST_DIR}/test/mock_assert.cpp
- ${CMAKE_CURRENT_LIST_DIR}/test/mock_ffa_api.cpp
- ${CMAKE_CURRENT_LIST_DIR}/test/mock_sp_rxtx.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_assert.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_ffa_api.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_sp_rxtx.cpp
INCLUDE_DIRECTORIES
${CMAKE_CURRENT_LIST_DIR}/include/
+ ${CMAKE_CURRENT_LIST_DIR}/mock
${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
COMPILE_DEFINITIONS
-DARM64
@@ -119,9 +127,10 @@
${CMAKE_CURRENT_LIST_DIR}/test/test_sp_memory_management_internals.cpp
${CMAKE_CURRENT_LIST_DIR}/test/sp_memory_management_internals.yml
${CMAKE_CURRENT_LIST_DIR}/ffa_memory_descriptors.c
- ${CMAKE_CURRENT_LIST_DIR}/test/mock_assert.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_assert.cpp
INCLUDE_DIRECTORIES
${CMAKE_CURRENT_LIST_DIR}/include/
+ ${CMAKE_CURRENT_LIST_DIR}/mock
${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
COMPILE_DEFINITIONS
-DARM64
@@ -131,10 +140,11 @@
NAME libsp_sp_messaging
SOURCES
${CMAKE_CURRENT_LIST_DIR}/test/test_sp_messaging.cpp
- ${CMAKE_CURRENT_LIST_DIR}/test/mock_ffa_api.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_ffa_api.cpp
${CMAKE_CURRENT_LIST_DIR}/sp_messaging.c
INCLUDE_DIRECTORIES
${CMAKE_CURRENT_LIST_DIR}/include/
+ ${CMAKE_CURRENT_LIST_DIR}/mock
${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
COMPILE_DEFINITIONS
-DARM64
@@ -144,11 +154,12 @@
NAME libsp_sp_messaging_with_routing_extension
SOURCES
${CMAKE_CURRENT_LIST_DIR}/test/test_sp_messaging.cpp
- ${CMAKE_CURRENT_LIST_DIR}/test/mock_ffa_api.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/mock/mock_ffa_api.cpp
${CMAKE_CURRENT_LIST_DIR}/sp_messaging.c
${CMAKE_CURRENT_LIST_DIR}/ffa_direct_msg_routing_extension.c
INCLUDE_DIRECTORIES
${CMAKE_CURRENT_LIST_DIR}/include/
+ ${CMAKE_CURRENT_LIST_DIR}/mock
${UNIT_TEST_PROJECT_PATH}/components/common/utils/include
COMPILE_DEFINITIONS
-DARM64