Hotfix: Fix tests build issues
- Re-enable PSA API FF tests. It requires to split NS app, raw log and
tests builds. PSA API FF tests require to build dedicated secure
partitions. Those secure partition libraries are added in PSA Arch
test CMakeLists. Therefore, PSA Arch test CMakeLists shall be executed
before secure_fw.
- Fix BL2 test build failure when NS app and other tests are disabled
- Rename TFM_NS_LOG_PATH config since raw log in tf-m-tests repo is used
in both NS log and BL2 test log.
Change-Id: I8926679ceb0643cf6a39ba6bbffd2202ff3fc4be
Signed-off-by: David Hu <david.hu@arm.com>
diff --git a/lib/ext/tf-m-tests/fetch_repo.cmake b/lib/ext/tf-m-tests/fetch_repo.cmake
index 47bce13..a477214 100644
--- a/lib/ext/tf-m-tests/fetch_repo.cmake
+++ b/lib/ext/tf-m-tests/fetch_repo.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
#
@@ -41,6 +41,6 @@
set(TFM_TEST_PATH ${TFM_TEST_REPO_PATH}/test CACHE PATH "Path to TFM tests" FORCE)
endif()
-if (NOT TFM_NS_LOG_PATH)
- set(TFM_NS_LOG_PATH ${TFM_TEST_REPO_PATH}/log CACHE PATH "Path to NS log" FORCE)
+if (NOT TFM_RAW_LOG_PATH)
+ set(TFM_RAW_LOG_PATH ${TFM_TEST_REPO_PATH}/log CACHE PATH "Path to TF-M raw log" FORCE)
endif()