diff options
author | Kevin Peng <kevin.peng@arm.com> | 2020-07-08 15:30:24 +0800 |
---|---|---|
committer | Kevin Peng <kevin.peng@arm.com> | 2020-07-17 15:11:54 +0800 |
commit | c5781480b8bbc2c3aae494d6e81f37ac12ef21d6 (patch) | |
tree | 4aac0e9aa0ff229495dd927ddbeae7d186de94b6 /app | |
parent | 7b299f55d51a5f75a0e84c5d51af61dcf20e3e8c (diff) | |
download | trusted-firmware-m-c5781480b8bbc2c3aae494d6e81f37ac12ef21d6.tar.gz |
Build: Define TEST_DIR once and use it everywhere
The TEST_DIR was defined in multiple files and it was not used
everywhere, some uses ${TFM_ROOT_DIR}/test instead.
This patch unifies the TEST_DIR definition to CommonConfig.cmake
and use it everywhere.
Change-Id: I04d1104ad2453f4fa595b27b7a77146acf809e4f
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
Diffstat (limited to 'app')
-rw-r--r-- | app/CMakeLists.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 164cf33676..2039a6a7d2 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -15,7 +15,6 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/../cmake) set(APP_DIR ${CMAKE_CURRENT_LIST_DIR}) get_filename_component(TFM_ROOT_DIR ${APP_DIR}/.. ABSOLUTE) set(INTERFACE_DIR ${TFM_ROOT_DIR}/interface) -set(TEST_DIR ${TFM_ROOT_DIR}/test) #Include common stuff to control cmake. include("Common/BuildSys") @@ -216,7 +215,7 @@ elseif (TFM_NS_CLIENT_IDENTIFICATION) target_compile_definitions(${PROJECT_OBJ_LIB} PRIVATE TFM_NS_CLIENT_IDENTIFICATION) endif() -add_subdirectory(${TFM_ROOT_DIR}/test ${CMAKE_BINARY_DIR}/test/non_secure_test) +add_subdirectory(${TEST_DIR} ${CMAKE_BINARY_DIR}/test/non_secure_test) # For the non-swapping BL2 configuration two executables need to be built. # One can be executed from the primary slot flash partition and other from the @@ -420,7 +419,7 @@ if(NOT TARGET tfm_non_secure_tests) #Add the test source to the build. #As of today since secure_fw is built as a sub-project this code will never execute. option(ENABLE_PROTECTED_STORAGE_SERVICE_TESTS "" TRUE) - include(../test/CMakeLists.inc) + include(${TEST_DIR}/CMakeLists.inc) target_sources(${PROJECT_OBJ_LIB} PUBLIC ${ALL_SRC_C} ${ALL_SRC_C_NS}) endif() |