michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests/bsim compile: Do not provide prj conf if default

Browse source 
Do not provide the defautl prj.conf to cmake, as that
causes it to not use the board overlays, which is not
what users would normally expect.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
This commit is contained in:
Alberto Escolar Piedras 2023-03-21 12:12:22 +01:00 • committed by Carles Cufí
commit a20046b5b0
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tests/bsim/compile.source
View file

@ -39,8 +39,11 @@ function _compile(){
local ret=0 local ret=0
local cmake_cmd=(cmake -GNinja -DBOARD_ROOT=${BOARD_ROOT} -DBOARD=${BOARD} \ local cmake_cmd=(cmake -GNinja -DBOARD_ROOT=${BOARD_ROOT} -DBOARD=${BOARD})
-DCONF_FILE=${conf_file} -DOVERLAY_CONFIG=${conf_overlay} \ if [ $conf_file != "prj.conf" ]; then
local cmake_cmd+=( -DCONF_FILE=${conf_file})
fi
local cmake_cmd+=( -DOVERLAY_CONFIG=${conf_overlay} \
${modules_arg} \ ${modules_arg} \
${cmake_args} -DCMAKE_C_FLAGS=\"${cc_flags}\" ${app_root}/${app}) ${cmake_args} -DCMAKE_C_FLAGS=\"${cc_flags}\" ${app_root}/${app})