Rename add_unit_test_suite function and parameters
The add_unit_test_suite function was renamed to unit_test_add_suite.
This way all future unit test related functions could follow the pattern
of having "unit_test_" as a prefix in their names. Also made parameter
names consistent to the ones used by CMake built-ins. The following
parameters have been renamed:
TEST_NAME -> NAME
TEST_SOURCES -> SOURCES
TEST_INCLUDES -> INCLUDE_DIRECTORIES
TEST_DEFINES -> COMPILE_DEFINITIONS
Change-Id: I02ce4c84cc8b63422aa696a5670e7f5bb65af00c
Signed-off-by: Imre Kis <imre.kis@arm.com>
diff --git a/cmake/UnitTest.cmake b/cmake/UnitTest.cmake
index 207b25c..cb496f7 100644
--- a/cmake/UnitTest.cmake
+++ b/cmake/UnitTest.cmake
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -15,20 +15,20 @@
# Modules
# CTest module should be included in the root CMakeLists.txt before calling this function
-function(add_unit_test_suite)
+function(unit_test_add_suite)
set(_OPTIONS_ARGS args1)
- set(_ONE_VALUE_ARGS TEST_NAME)
- set(_MULTI_VALUE_ARGS TEST_SOURCES TEST_INCLUDES TEST_DEFINES)
+ set(_ONE_VALUE_ARGS NAME)
+ set(_MULTI_VALUE_ARGS SOURCES INCLUDE_DIRECTORIES COMPILE_DEFINITIONS)
cmake_parse_arguments(_MY_PARAMS "${_OPTIONS_ARGS}" "${_ONE_VALUE_ARGS}" "${_MULTI_VALUE_ARGS}" ${ARGN})
# TODO: check_args(add_unit_test_suite args1 args2 args3)
- set(TEST_NAME ${_MY_PARAMS_TEST_NAME})
- set(TEST_INCLUDES ${_MY_PARAMS_TEST_INCLUDES})
- set(TEST_DEFINES ${_MY_PARAMS_TEST_DEFINES})
+ set(TEST_NAME ${_MY_PARAMS_NAME})
+ set(TEST_INCLUDE_DIRECTORIES ${_MY_PARAMS_INCLUDE_DIRECTORIES})
+ set(TEST_COMPILE_DEFINITIONS ${_MY_PARAMS_COMPILE_DEFINITIONS})
add_executable(${TEST_NAME} ${UNIT_TEST_COMMON_SOURCES})
- foreach(TEST_SOURCE ${_MY_PARAMS_TEST_SOURCES})
+ foreach(TEST_SOURCE ${_MY_PARAMS_SOURCES})
get_filename_component(TEST_SOURCE_EXTENSION ${TEST_SOURCE} EXT)
if (${TEST_SOURCE_EXTENSION} STREQUAL ".yml")
@@ -65,7 +65,7 @@
target_sources(${TEST_NAME} PRIVATE ${TEST_SOURCE})
endforeach()
- target_include_directories(${TEST_NAME} PRIVATE ${TEST_INCLUDES})
- target_compile_definitions(${TEST_NAME} PRIVATE ${TEST_DEFINES})
+ target_include_directories(${TEST_NAME} PRIVATE ${TEST_INCLUDE_DIRECTORIES})
+ target_compile_definitions(${TEST_NAME} PRIVATE ${TEST_COMPILE_DEFINITIONS})
add_test(${TEST_NAME} ${TEST_NAME})
endfunction()
diff --git a/tests/lib/libc/test_libc.cmake b/tests/lib/libc/test_libc.cmake
index 2dbf66f..8feee29 100644
--- a/tests/lib/libc/test_libc.cmake
+++ b/tests/lib/libc/test_libc.cmake
@@ -6,22 +6,22 @@
include(UnitTest)
-add_unit_test_suite(
- TEST_NAME memcmp
- TEST_SOURCES
+unit_test_add_suite(
+ NAME memcmp
+ SOURCES
${CMAKE_CURRENT_LIST_DIR}/test_memcmp.cpp
${CMAKE_CURRENT_LIST_DIR}/memcmp.yml
- TEST_INCLUDES
+ INCLUDE_DIRECTORIES
${TF_A_PATH}/include
${TF_A_PATH}/include/lib/libc/aarch64/
)
-add_unit_test_suite(
- TEST_NAME memcpy
- TEST_SOURCES
+unit_test_add_suite(
+ NAME memcpy
+ SOURCES
${CMAKE_CURRENT_LIST_DIR}/test_memcpy.cpp
${CMAKE_CURRENT_LIST_DIR}/memcpy.yml
- TEST_INCLUDES
+ INCLUDE_DIRECTORIES
${TF_A_PATH}/include
${TF_A_PATH}/include/lib/libc/aarch64/
)