adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

cmake: change test message overwrite to macro

Browse source 
Fixes: #79052

The yaml CMake tests overwrites `message()` in order to verify correct
error handling. This was original done in a function and then using
a return call when an expected error has been raised.
Using a function() means the `return()` only returns the `message()`
and thus wrongly continue processing rest of the yaml file.

Change `message()` to macro so the return call correctly returns from
the calling yaml functions.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
This commit is contained in:
Torsten Rasmussen 2024-09-26 16:18:26 +02:00 committed by Fabio Baltieri
parent 759f3a0c7c
commit d128a078f6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/cmake/yaml/CMakeLists.txt
View file

@ -8,7 +8,7 @@ target_sources(app PRIVATE ${ZEPHYR_BASE}/misc/empty_file.c)
set_property(GLOBAL PROPERTY EXPECTED_ERROR 0)
function(message)
macro(message)
if(DEFINED expect_failure)
if(${ARGV0} STREQUAL FATAL_ERROR)
if("${ARGV1}" STREQUAL "${expect_failure}")
@ -23,7 +23,7 @@ function(message)
endif()
endif()
_message(${ARGN})
endfunction()
endmacro()
macro(test_assert)
cmake_parse_arguments(TA_ARG "" "COMMENT" "TEST" ${ARGN})