diff --git a/tests/bsim/bluetooth/host/misc/conn_stress/scripts/_conn_stress.sh b/tests/bsim/bluetooth/host/misc/conn_stress/scripts/_conn_stress.sh index 4b10172cdd3d04..8e1428e44c04bc 100755 --- a/tests/bsim/bluetooth/host/misc/conn_stress/scripts/_conn_stress.sh +++ b/tests/bsim/bluetooth/host/misc/conn_stress/scripts/_conn_stress.sh @@ -23,23 +23,12 @@ function Execute(){ } test_path="bsim_bluetooth_host_misc_conn_stress" -bsim_central_exe_name="bs_nrf52_${test_path}_central_prj_conf" -bsim_peripheral_exe_name="bs_nrf52_${test_path}_peripheral_prj_conf" +bsim_central_exe_name="bs_${BOARD_TS}_${test_path}_central_prj_conf" +bsim_peripheral_exe_name="bs_${BOARD_TS}_${test_path}_peripheral_prj_conf" # terminate running simulations (if any) ${BSIM_COMPONENTS_PATH}/common/stop_bsim.sh $simulation_id -# (re)Build the central & peripheral images. Don't continue if build fails. -west build -b ${BOARD} -d build_central central && \ - cp build_central/zephyr/zephyr.exe \ - "${BSIM_OUT_PATH}/bin/${bsim_central_exe_name}" \ - || exit 1 - -west build -b ${BOARD} -d build_peripheral peripheral && \ - cp build_peripheral/zephyr/zephyr.exe \ - "${BSIM_OUT_PATH}/bin/${bsim_peripheral_exe_name}" \ - || exit 1 - cd ${BSIM_OUT_PATH}/bin bsim_args="-RealEncryption=1 -v=2 -s=${simulation_id}" diff --git a/tests/bsim/bluetooth/ll/_compile_permutate_kconfigs.sh b/tests/bsim/bluetooth/ll/_compile_permutate_kconfigs.sh index f739409b71eb6f..cee231c2657242 100755 --- a/tests/bsim/bluetooth/ll/_compile_permutate_kconfigs.sh +++ b/tests/bsim/bluetooth/ll/_compile_permutate_kconfigs.sh @@ -14,8 +14,8 @@ DEBUG_PERMUTATE=false directory}" source ${ZEPHYR_BASE}/tests/bsim/compile.source - BOARD_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}" +BOARD_TS="${BOARD//\//_}" mkdir -p ${WORK_DIR} diff --git a/tests/bsim/bluetooth/ll/bis/testcase.yaml b/tests/bsim/bluetooth/ll/bis/testcase.yaml index dc88c8b144688f..24567754c3d24a 100644 --- a/tests/bsim/bluetooth/ll/bis/testcase.yaml +++ b/tests/bsim/bluetooth/ll/bis/testcase.yaml @@ -8,11 +8,11 @@ tests: bluetooth.ll.bis: sysbuild: true platform_allow: - - nrf52_bsim + - nrf52_bsim/native - nrf5340bsim/nrf5340/cpuapp - nrf5340bsim/nrf5340/cpunet integration_platforms: - - nrf52_bsim + - nrf52_bsim/native - nrf5340bsim/nrf5340/cpuapp - nrf5340bsim/nrf5340/cpunet harness: bsim @@ -21,10 +21,10 @@ tests: bluetooth.ll.bis_ticker_expire_info: extra_args: EXTRA_CONF_FILE=overlay-ticker_expire_info.conf platform_allow: - - nrf52_bsim + - nrf52_bsim/native - nrf5340bsim/nrf5340/cpunet integration_platforms: - - nrf52_bsim + - nrf52_bsim/native - nrf5340bsim/nrf5340/cpunet harness: bsim harness_config: @@ -32,10 +32,10 @@ tests: bluetooth.ll.bis_vs_dp: extra_args: CONF_FILE=prj_vs_dp.conf platform_allow: - - nrf52_bsim + - nrf52_bsim/native - nrf5340bsim/nrf5340/cpunet integration_platforms: - - nrf52_bsim + - nrf52_bsim/native - nrf5340bsim/nrf5340/cpunet harness: bsim harness_config: @@ -43,10 +43,10 @@ tests: bluetooth.ll.bis_past: extra_args: CONF_FILE=prj_past.conf platform_allow: - - nrf52_bsim + - nrf52_bsim/native - nrf5340bsim/nrf5340/cpunet integration_platforms: - - nrf52_bsim + - nrf52_bsim/native - nrf5340bsim/nrf5340/cpunet harness: bsim harness_config: diff --git a/tests/bsim/bluetooth/mesh/README.rst b/tests/bsim/bluetooth/mesh/README.rst index 02f16740bb5a01..24c1fe48f3e265 100644 --- a/tests/bsim/bluetooth/mesh/README.rst +++ b/tests/bsim/bluetooth/mesh/README.rst @@ -50,7 +50,7 @@ Then separately, call ...code-block:: - gdb bs_nrf52_bsim_tests_bsim_bluetooth_mesh_prj_conf \ + gdb bs_nrf52_bsim_native_tests_bsim_bluetooth_mesh_prj_conf \ -s=mesh_transport_seg_block -d=0 -RealEncryption=1 \ -testid=transport_tx_seg_block