Skip to content

Commit 05e78fa

Browse files
Andries Kruithofcarlescufi
authored andcommitted
Tests: bsim: update permutations compilation script
The script that compiles different permutations of Kconfig settings for the control procedures must build each permutation in sequence. The current implementation of the compile-script starts each build in the background. This PR fixes that so that each build now is run sequentially. Signed-off-by: Andries Kruithof <[email protected]>
1 parent 774affe commit 05e78fa

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

tests/bsim/bluetooth/_compile_permutate_kconfigs.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ DEBUG_PERMUTATE=false
1515
: "${ZEPHYR_BASE:?ZEPHYR_BASE must be set to point to the zephyr root\
1616
directory}"
1717

18-
WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_bt_out}"
18+
WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}"
1919
BOARD="${BOARD:-nrf52_bsim}"
2020
BOARD_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}"
2121

@@ -62,10 +62,13 @@ perm_compile() {
6262
echo "Compile with config overlay:"
6363
cat $3
6464
fi
65-
local app=tests/bsim/bluetooth/edtt_ble_test_app/hci_test_app
65+
local app=tests/bsim/bluetooth/ll/edtt/hci_test_app
6666
local conf_file=prj_dut_llcp.conf
6767
local conf_overlay=$3
68-
compile
68+
# Note: we need to call '_compile' instead of 'compile' because the latter starts
69+
# compilations in parallel, but here we need to do it in serial since we modify
70+
# the configuration file between each run
71+
_compile
6972
if [ ! -f ${executable_name} ]; then
7073
compile_failures=$(expr $compile_failures + 1)
7174
fi

0 commit comments

Comments
 (0)