From 8310017dd38cd38b9cce901224b022ab8a8443b0 Mon Sep 17 00:00:00 2001 From: Alberto Escolar Piedras Date: Mon, 2 Dec 2024 13:21:04 +0100 Subject: [PATCH] tests/bsim/bluetooth/ll/_compile_permutate_kconfigs: Update This test was starting to rot: BOARD should have been replaced with BOARD_TS. Let's also remove a few duplicate checks and definitions. Signed-off-by: Alberto Escolar Piedras --- .../bsim/bluetooth/ll/_compile_permutate_kconfigs.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tests/bsim/bluetooth/ll/_compile_permutate_kconfigs.sh b/tests/bsim/bluetooth/ll/_compile_permutate_kconfigs.sh index 5b268239033..f739409b71e 100755 --- a/tests/bsim/bluetooth/ll/_compile_permutate_kconfigs.sh +++ b/tests/bsim/bluetooth/ll/_compile_permutate_kconfigs.sh @@ -10,20 +10,15 @@ # set DEBUG_PERMUTATE to 'true' for extra debug output DEBUG_PERMUTATE=false -: "${BSIM_OUT_PATH:?BSIM_OUT_PATH must be defined}" -: "${BSIM_COMPONENTS_PATH:?BSIM_COMPONENTS_PATH must be defined}" : "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root\ directory}" -WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}" -BOARD="${BOARD:-nrf52_bsim}" +source ${ZEPHYR_BASE}/tests/bsim/compile.source + BOARD_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" mkdir -p ${WORK_DIR} -source ${ZEPHYR_BASE}/tests/bsim/compile.source - - declare -a list=( "CONFIG_BT_CENTRAL=" "CONFIG_BT_PERIPHERAL=" @@ -42,7 +37,7 @@ perm_compile() { # created by the compile scripts since that may mess up other tests # We also delete the executable to avoid having artifacts from # a previous run - local exe_name="bs_nrf52_bsim_tests_kconfig_perm" + local exe_name="bs_${BOARD_TS}_tests_kconfig_perm" local executable_name=${exe_name} local executable_name=${BSIM_OUT_PATH}/bin/$executable_name