michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: bsim: compile: Add support to supply EXTRA_CONF_FILE

Browse source 
Add support in bsim compile script to accept EXTRA_CONF_FILE
so that overlay conf files can be supplied at compile time.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2024-04-16 14:31:14 +02:00 • committed by Fabio Baltieri
commit aed68169c6
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

@ -19,6 +19,7 @@ function _compile(){
local app_root="${app_root:-${ZEPHYR_BASE}}" local app_root="${app_root:-${ZEPHYR_BASE}}"
local BOARD_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" local BOARD_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}"
local conf_file="${conf_file:-prj.conf}" local conf_file="${conf_file:-prj.conf}"
local extra_conf_file="${extra_conf_file:-""}"
local conf_overlay="${conf_overlay:-""}" local conf_overlay="${conf_overlay:-""}"
default_cmake_args=(-DCONFIG_COVERAGE=y -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ default_cmake_args=(-DCONFIG_COVERAGE=y -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
@ -29,8 +30,9 @@ function _compile(){
local cc_flags="${cc_flags:-""}" local cc_flags="${cc_flags:-""}"
if [ "${conf_overlay}" ]; then if [ "${conf_overlay}" ]; then
overlays="${conf_overlay//;/_}" overlay_basename="${conf_overlay##*/}"
local exe_basename="${exe_name:-bs_${BOARD}_${app}_${conf_file}_${overlays}}" overlay_file="${overlay_basename//;/_}"
local exe_basename="${exe_name:-bs_${BOARD}_${app}_${conf_file}_${overlay_file}}"
else else
local exe_basename="${exe_name:-bs_${BOARD}_${app}_${conf_file}}" local exe_basename="${exe_name:-bs_${BOARD}_${app}_${conf_file}}"
fi fi
@ -53,6 +55,7 @@ function _compile(){
fi fi
orifs="$IFS"; IFS= orifs="$IFS"; IFS=
local cmake_cmd+=( -DOVERLAY_CONFIG="${conf_overlay}" \ local cmake_cmd+=( -DOVERLAY_CONFIG="${conf_overlay}" \
-DEXTRA_CONF_FILE="${extra_conf_file}" \
${modules_arg} \ ${modules_arg} \
"${cmake_args[@]}" ${cc_flags:+-DCMAKE_C_FLAGS=${cc_flags}} ${cmake_extra_args}) "${cmake_args[@]}" ${cc_flags:+-DCMAKE_C_FLAGS=${cc_flags}} ${cmake_extra_args})
if [ -v sysbuild ]; then if [ -v sysbuild ]; then