commit 195cb5a86359c54a47de21734f4d8a1c01a9a118
author David Hu <david.hu@arm.com> Tue May 10 22:03:26 2022 +0800
committer David Hu <david.hu@arm.com> Wed May 25 11:43:11 2022 +0200
tree 1b6438e868d1578ddbaecb63a9118a6cff3729d1
parent 130fb9f54d619aed3a9c9f9a3449ae3557b13f31

Build: Adjust regression test config setting

Parse test config passed via command line prior to platform specific
config.cmake.
Some platforms select different config when tests are enabled. Those
platform specific config.cmake can select the config according to
TFM_NS/S_REG_TEST, instead of going though all the test case configs.

Change-Id: I4cdda558228dfaf00ca15efe74146186f41b1ff5
Signed-off-by: David Hu <david.hu@arm.com>

lib/ext/tf-m-tests/fetch_repo.cmake

diff --git a/lib/ext/tf-m-tests/fetch_repo.cmake b/lib/ext/tf-m-tests/fetch_repo.cmake
index 40dc48f..593ff1d 100644
--- a/lib/ext/tf-m-tests/fetch_repo.cmake
+++ b/lib/ext/tf-m-tests/fetch_repo.cmake
@@ -10,29 +10,44 @@
     cmake_policy(SET CMP0097 NEW)
 endif()
 
-include(FetchContent)
-set(FETCHCONTENT_QUIET FALSE)
+# If NS app, secure regression test or non-secure regression test is enabled,
+# fetch tf-m-tests repo.
+# The conditiions are actually overlapped but it can make the logic more clear.
+# Besides, the dependencies between NS app and regression tests will be
+# optimized later.
+if (NS OR TFM_S_REG_TEST OR TFM_NS_REG_TEST OR TEST_BL2 OR TEST_BL1_1 OR TEST_BL1_2)
+    # Set tf-m-tests repo config
+    include(${CMAKE_SOURCE_DIR}/lib/ext/tf-m-tests/repo_config_default.cmake)
 
-set(FETCHCONTENT_BASE_DIR ${CMAKE_BINARY_DIR}/lib/ext CACHE STRING "" FORCE)
+    include(FetchContent)
+    set(FETCHCONTENT_QUIET FALSE)
 
-if ("${TFM_TEST_REPO_PATH}" STREQUAL "DOWNLOAD")
-    FetchContent_Declare(tfm_test_repo
-        GIT_REPOSITORY https://git.trustedfirmware.org/TF-M/tf-m-tests.git
-        GIT_TAG ${TFM_TEST_REPO_VERSION}
-        GIT_PROGRESS TRUE
-    )
+    set(FETCHCONTENT_BASE_DIR ${CMAKE_BINARY_DIR}/lib/ext CACHE STRING "" FORCE)
 
-    FetchContent_GetProperties(tfm_test_repo)
-    if(NOT tfm_test_repo_POPULATED)
-        FetchContent_Populate(tfm_test_repo)
-        set(TFM_TEST_REPO_PATH ${tfm_test_repo_SOURCE_DIR} CACHE PATH "Path to TFM-TEST repo (or DOWNLOAD to fetch automatically" FORCE)
+    if ("${TFM_TEST_REPO_PATH}" STREQUAL "DOWNLOAD")
+        FetchContent_Declare(tfm_test_repo
+            GIT_REPOSITORY https://git.trustedfirmware.org/TF-M/tf-m-tests.git
+            GIT_TAG ${TFM_TEST_REPO_VERSION}
+            GIT_PROGRESS TRUE
+        )
+
+        FetchContent_GetProperties(tfm_test_repo)
+        if(NOT tfm_test_repo_POPULATED)
+            FetchContent_Populate(tfm_test_repo)
+            set(TFM_TEST_REPO_PATH ${tfm_test_repo_SOURCE_DIR} CACHE PATH "Path to TFM-TEST repo (or DOWNLOAD to fetch automatically" FORCE)
+        endif()
     endif()
-endif()
 
-if ("${CMSIS_5_PATH}" STREQUAL DOWNLOAD)
-    set(CMSIS_5_PATH ${TFM_TEST_REPO_PATH}/CMSIS CACHE PATH "Path to CMSIS_5 (or DOWNLOAD to fetch automatically" FORCE)
-endif()
+    if ("${CMSIS_5_PATH}" STREQUAL DOWNLOAD)
+        set(CMSIS_5_PATH ${TFM_TEST_REPO_PATH}/CMSIS CACHE PATH "Path to CMSIS_5 (or DOWNLOAD to fetch automatically" FORCE)
+    endif()
 
-if (NOT TFM_TEST_PATH)
-    set(TFM_TEST_PATH ${TFM_TEST_REPO_PATH}/test CACHE PATH "Path to TFM tests" FORCE)
+    if (NOT TFM_TEST_PATH)
+        set(TFM_TEST_PATH ${TFM_TEST_REPO_PATH}/test CACHE PATH "Path to TFM tests" FORCE)
+    endif()
+
+    # Load TF-M regression test suites setting
+    if (TFM_NS_REG_TEST OR TFM_S_REG_TEST)
+        include(${TFM_TEST_PATH}/config/set_config.cmake)
+    endif()
 endif()