commit 4817eb8a0495fe08e104276e66320a7619759df4
author Raef Coles <raef.coles@arm.com> Tue Jan 18 12:33:24 2022 +0000
committer Anton Komlev <Anton.Komlev@arm.com> Tue Jan 25 14:16:37 2022 +0100
tree ca93a594db088aa3b3e186ba31bf3587a30d6c20
parent 84400cc13118a262357db8defa860a8980c37dca

Build: Revert hotfix and fix BL2 test issues

- Revert all hotfix changes
- Move PSA api test cmake from secure_fw into app cmakelists
- Change log from using DOMAIN_NS to USE_SP_LOG and invert ifdefs
- Update BL2 tests to avoid corrupting images in various scenarios
- Standardise test skip colour and fix colour name typo

Change-Id: I10a1d7ee7123f452cf56eb29bc255a4f44b7b795
Signed-off-by: Raef Coles <raef.coles@arm.com>

app/CMakeLists.txt

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 9f3a7d1..70edf69 100755
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -198,6 +198,72 @@
     endif()
 
     add_subdirectory(${PSA_ARCH_TESTS_PATH}/api-tests ${CMAKE_CURRENT_BINARY_DIR}/psa_api_tests)
+
+    if (TEST_PSA_API STREQUAL IPC)
+        target_include_directories(tfm_partitions
+            INTERFACE
+                ${CMAKE_BINARY_DIR}/generated/api-tests/platform/manifests
+        )
+
+        target_sources(tfm_psa_rot_partition_driver_partition
+            PRIVATE
+                ${CMAKE_BINARY_DIR}/generated/api-tests/platform/manifests/auto_generated/intermedia_driver_partition_psa.c
+        )
+        target_link_libraries(tfm_psa_rot_partition_driver_partition
+            PRIVATE
+                psa_interface
+                platform_s
+        )
+        target_compile_definitions(tfm_psa_rot_partition_driver_partition
+            PRIVATE
+                CONFIG_TFM_BUILDING_SPE=1
+                TFM_LVL=${TFM_ISOLATION_LEVEL}
+        )
+
+        target_sources(tfm_app_rot_partition_client_partition
+            PRIVATE
+                ${CMAKE_BINARY_DIR}/generated/api-tests/platform/manifests/auto_generated/intermedia_client_partition_psa.c
+        )
+        target_link_libraries(tfm_app_rot_partition_client_partition
+            PRIVATE
+                psa_interface
+                platform_s
+        )
+        target_compile_definitions(tfm_app_rot_partition_client_partition
+            PRIVATE
+                CONFIG_TFM_BUILDING_SPE=1
+                TFM_LVL=${TFM_ISOLATION_LEVEL}
+        )
+
+        target_sources(tfm_app_rot_partition_server_partition
+            PRIVATE
+                ${CMAKE_BINARY_DIR}/generated/api-tests/platform/manifests/auto_generated/intermedia_server_partition_psa.c
+        )
+        target_link_libraries(tfm_app_rot_partition_server_partition
+            PRIVATE
+                psa_interface
+                platform_s
+        )
+        target_compile_definitions(tfm_app_rot_partition_server_partition
+            PRIVATE
+                CONFIG_TFM_BUILDING_SPE=1
+                TFM_LVL=${TFM_ISOLATION_LEVEL}
+        )
+
+        target_sources(tfm_partitions
+            INTERFACE
+                ${CMAKE_BINARY_DIR}/generated/api-tests/platform/manifests/auto_generated/load_info_driver_partition_psa.c
+                ${CMAKE_BINARY_DIR}/generated/api-tests/platform/manifests/auto_generated/load_info_client_partition_psa.c
+                ${CMAKE_BINARY_DIR}/generated/api-tests/platform/manifests/auto_generated/load_info_server_partition_psa.c
+        )
+
+        target_link_libraries(tfm_partitions
+            INTERFACE
+                tfm_psa_rot_partition_driver_partition
+                tfm_app_rot_partition_client_partition
+                tfm_app_rot_partition_server_partition
+        )
+    endif()
 endif()
 
 ############################# Test integration #################################