Skip to content

Commit d11f726

Browse files
ardo-nordickartben
authored andcommitted
tests: bsim: bluetooth: using full nrf52bsim board name
Some places kept using partial nrf52bsim board name which led to inconsistencies. Signed-off-by: Artur Dobrynin <artur.dobrynin@nordicsemi.no>
1 parent cdec82e commit d11f726

File tree

4 files changed

+12
-23
lines changed

4 files changed

+12
-23
lines changed

tests/bsim/bluetooth/host/misc/conn_stress/scripts/_conn_stress.sh

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,12 @@ function Execute(){
2323
}
2424

2525
test_path="bsim_bluetooth_host_misc_conn_stress"
26-
bsim_central_exe_name="bs_nrf52_${test_path}_central_prj_conf"
27-
bsim_peripheral_exe_name="bs_nrf52_${test_path}_peripheral_prj_conf"
26+
bsim_central_exe_name="bs_${BOARD_TS}_${test_path}_central_prj_conf"
27+
bsim_peripheral_exe_name="bs_${BOARD_TS}_${test_path}_peripheral_prj_conf"
2828

2929
# terminate running simulations (if any)
3030
${BSIM_COMPONENTS_PATH}/common/stop_bsim.sh $simulation_id
3131

32-
# (re)Build the central & peripheral images. Don't continue if build fails.
33-
west build -b ${BOARD} -d build_central central && \
34-
cp build_central/zephyr/zephyr.exe \
35-
"${BSIM_OUT_PATH}/bin/${bsim_central_exe_name}" \
36-
|| exit 1
37-
38-
west build -b ${BOARD} -d build_peripheral peripheral && \
39-
cp build_peripheral/zephyr/zephyr.exe \
40-
"${BSIM_OUT_PATH}/bin/${bsim_peripheral_exe_name}" \
41-
|| exit 1
42-
4332
cd ${BSIM_OUT_PATH}/bin
4433

4534
bsim_args="-RealEncryption=1 -v=2 -s=${simulation_id}"

tests/bsim/bluetooth/ll/_compile_permutate_kconfigs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ DEBUG_PERMUTATE=false
1414
directory}"
1515

1616
source ${ZEPHYR_BASE}/tests/bsim/compile.source
17-
1817
BOARD_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}"
18+
BOARD_TS="${BOARD//\//_}"
1919

2020
mkdir -p ${WORK_DIR}
2121

tests/bsim/bluetooth/ll/bis/testcase.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ tests:
88
bluetooth.ll.bis:
99
sysbuild: true
1010
platform_allow:
11-
- nrf52_bsim
11+
- nrf52_bsim/native
1212
- nrf5340bsim/nrf5340/cpuapp
1313
- nrf5340bsim/nrf5340/cpunet
1414
integration_platforms:
15-
- nrf52_bsim
15+
- nrf52_bsim/native
1616
- nrf5340bsim/nrf5340/cpuapp
1717
- nrf5340bsim/nrf5340/cpunet
1818
harness: bsim
@@ -21,32 +21,32 @@ tests:
2121
bluetooth.ll.bis_ticker_expire_info:
2222
extra_args: EXTRA_CONF_FILE=overlay-ticker_expire_info.conf
2323
platform_allow:
24-
- nrf52_bsim
24+
- nrf52_bsim/native
2525
- nrf5340bsim/nrf5340/cpunet
2626
integration_platforms:
27-
- nrf52_bsim
27+
- nrf52_bsim/native
2828
- nrf5340bsim/nrf5340/cpunet
2929
harness: bsim
3030
harness_config:
3131
bsim_exe_name: tests_bsim_bluetooth_ll_bis_prj_conf_overlay-ticker_expire_info_conf
3232
bluetooth.ll.bis_vs_dp:
3333
extra_args: CONF_FILE=prj_vs_dp.conf
3434
platform_allow:
35-
- nrf52_bsim
35+
- nrf52_bsim/native
3636
- nrf5340bsim/nrf5340/cpunet
3737
integration_platforms:
38-
- nrf52_bsim
38+
- nrf52_bsim/native
3939
- nrf5340bsim/nrf5340/cpunet
4040
harness: bsim
4141
harness_config:
4242
bsim_exe_name: tests_bsim_bluetooth_ll_bis_prj_vs_dp_conf
4343
bluetooth.ll.bis_past:
4444
extra_args: CONF_FILE=prj_past.conf
4545
platform_allow:
46-
- nrf52_bsim
46+
- nrf52_bsim/native
4747
- nrf5340bsim/nrf5340/cpunet
4848
integration_platforms:
49-
- nrf52_bsim
49+
- nrf52_bsim/native
5050
- nrf5340bsim/nrf5340/cpunet
5151
harness: bsim
5252
harness_config:

tests/bsim/bluetooth/mesh/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Then separately, call
5050

5151
...code-block::
5252

53-
gdb bs_nrf52_bsim_tests_bsim_bluetooth_mesh_prj_conf \
53+
gdb bs_nrf52_bsim_native_tests_bsim_bluetooth_mesh_prj_conf \
5454
-s=mesh_transport_seg_block -d=0 -RealEncryption=1 \
5555
-testid=transport_tx_seg_block
5656

0 commit comments

Comments
 (0)