commit 2597d24bdbf5147aa32df413afa177d3373a2c31
author Jianliang Shen <jianliang.shen@arm.com> Fri Nov 03 14:01:58 2023 +0800
committer David Hu <david.hu@arm.com> Fri Nov 03 07:45:48 2023 +0100
tree 43c469899ccf679b1225c9a44e958b5d163b184a
parent e1171e08359dddb24312acf998ef6ca0511e9ef4

Fix: Avoid BL2_COMPILER_CP_FLAG being exported to secure test framework

BL2_COMPILER_CP_FLAG is added to target platform_bl2, and it exports
'-mfloat-abi=soft' with PUBLIC. Thus it is added to secure test
framework. When FPU tests are enabled, the COMPILER_CP_FLAG added to
secure test framework has the value 'hard'. This conflicts with
BL2_COMPILER_CP_FLAG when TEST_BL2 is enabled as well.

Create mcuboot test specific framework target to avoid transmitting
mcuboot compiler options to regression tests.

Signed-off-by: Jianliang Shen <jianliang.shen@arm.com>
Change-Id: I382f7c797e448c06b9c0f93228edb101dd65cea6

tests_reg/test/bl2/mcuboot/CMakeLists.txt

diff --git a/tests_reg/test/bl2/mcuboot/CMakeLists.txt b/tests_reg/test/bl2/mcuboot/CMakeLists.txt
index abb1665..17c7ab6 100644
--- a/tests_reg/test/bl2/mcuboot/CMakeLists.txt
+++ b/tests_reg/test/bl2/mcuboot/CMakeLists.txt
@@ -14,6 +14,7 @@
 set(LOG_SOURCE_ROOT ${TFM_TESTS_ROOT_DIR}/lib/log)
 
 add_library(mcuboot_test_log INTERFACE)
+add_library(mcuboot_test_framework_common INTERFACE)
 
 target_sources(mcuboot_test_log
     INTERFACE
@@ -30,8 +31,9 @@
         platform_bl2
 )
 
-target_link_libraries(tfm_test_framework_common
+target_link_libraries(mcuboot_test_framework_common
     INTERFACE
+        tfm_test_framework_common
         mcuboot_test_log
 )
 
@@ -51,7 +53,7 @@
 
 target_link_libraries(mcuboot_tests
     PUBLIC
-        tfm_test_framework_common
+        mcuboot_test_framework_common
     PRIVATE
         platform_bl2
         mcuboot_test_suite_integration

tests_reg/test/bl2/mcuboot/suites/integration/CMakeLists.txt

diff --git a/tests_reg/test/bl2/mcuboot/suites/integration/CMakeLists.txt b/tests_reg/test/bl2/mcuboot/suites/integration/CMakeLists.txt
index b2c1b29..4a330be 100644
--- a/tests_reg/test/bl2/mcuboot/suites/integration/CMakeLists.txt
+++ b/tests_reg/test/bl2/mcuboot/suites/integration/CMakeLists.txt
@@ -22,7 +22,6 @@
 
 target_link_libraries(mcuboot_test_suite_integration
     PUBLIC
-        tfm_test_framework_common
+        mcuboot_test_framework_common
         bootutil
-        platform_bl2
 )