From d2eb9248de894a3d4a40cf82470f9c3fa933f883 Mon Sep 17 00:00:00 2001 From: Vinayak Kariappa Chettimada Date: Sat, 2 Nov 2024 08:08:54 +0100 Subject: [PATCH 1/5] Bluetooth: Controller: Fix spurious ISO Sync receiver stall Fix spurious ISO Sync Receiver stall due to uninitialised value accessed due to regression introduced by commit 64faceea7270 ("Bluetooth: controller: Stop Sync ISO ticker when establishment fails"). Signed-off-by: Vinayak Kariappa Chettimada --- subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c index 2b17807f217edf..5eeba29b5e88ca 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c +++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c @@ -427,6 +427,7 @@ static void abort_cb(struct lll_prepare_param *prepare_param, void *param) LL_ASSERT(e); e->type = EVENT_DONE_EXTRA_TYPE_SYNC_ISO; + e->estab_failed = 0U; e->trx_cnt = 0U; e->crc_valid = 0U; @@ -1281,6 +1282,7 @@ static void isr_rx_done(void *param) /* Calculate and place the drift information in done event */ e->type = EVENT_DONE_EXTRA_TYPE_SYNC_ISO; + e->estab_failed = 0U; e->trx_cnt = trx_cnt; e->crc_valid = crc_ok_anchor; From 79402596e0a4068ae07fb11d4416a0e75a00e504 Mon Sep 17 00:00:00 2001 From: Alberto Escolar Piedras Date: Tue, 5 Nov 2024 10:36:51 +0100 Subject: [PATCH 2/5] tests bsim bt audio: Increase execution timeout These tests have been seen failing in CI due to the real time execution timeout. Let's increase it so it does not happen. Signed-off-by: Alberto Escolar Piedras --- .../test_scripts/bap_broadcast_audio_assistant_incorrect_code.sh | 1 + tests/bsim/bluetooth/audio/test_scripts/bap_unicast_audio.sh | 1 + .../audio/test_scripts/bap_unicast_audio_acl_disconnect.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant_incorrect_code.sh b/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant_incorrect_code.sh index e81bb6492f7c65..da853e6085dc11 100755 --- a/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant_incorrect_code.sh +++ b/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant_incorrect_code.sh @@ -6,6 +6,7 @@ SIMULATION_ID="bap_broadcast_audio_assistant_incorrect_code" VERBOSITY_LEVEL=2 +EXECUTE_TIMEOUT=180 source ${ZEPHYR_BASE}/tests/bsim/sh_common.source diff --git a/tests/bsim/bluetooth/audio/test_scripts/bap_unicast_audio.sh b/tests/bsim/bluetooth/audio/test_scripts/bap_unicast_audio.sh index 5bbf5d3d1a8e0f..24444440aa7a19 100755 --- a/tests/bsim/bluetooth/audio/test_scripts/bap_unicast_audio.sh +++ b/tests/bsim/bluetooth/audio/test_scripts/bap_unicast_audio.sh @@ -6,6 +6,7 @@ SIMULATION_ID="unicast_audio" VERBOSITY_LEVEL=2 +EXECUTE_TIMEOUT=120 source ${ZEPHYR_BASE}/tests/bsim/sh_common.source diff --git a/tests/bsim/bluetooth/audio/test_scripts/bap_unicast_audio_acl_disconnect.sh b/tests/bsim/bluetooth/audio/test_scripts/bap_unicast_audio_acl_disconnect.sh index 412473db53a9c0..1b0d1c2890d4e6 100755 --- a/tests/bsim/bluetooth/audio/test_scripts/bap_unicast_audio_acl_disconnect.sh +++ b/tests/bsim/bluetooth/audio/test_scripts/bap_unicast_audio_acl_disconnect.sh @@ -6,6 +6,7 @@ SIMULATION_ID="unicast_audio_acl_disconnect" VERBOSITY_LEVEL=2 +EXECUTE_TIMEOUT=120 source ${ZEPHYR_BASE}/tests/bsim/sh_common.source From a273ce3ba0f6c4bf53fc31a233693fc23f7e3e06 Mon Sep 17 00:00:00 2001 From: Alberto Escolar Piedras Date: Tue, 5 Nov 2024 14:24:56 +0100 Subject: [PATCH 3/5] tests/bsim/bluetooth/audio: Increase EXECUTION_TIMEOUT where needed Increase the EXECUTION_TIMEOUT (real time timeout at which the test will be killed), so we have more margin for CI. Signed-off-by: Alberto Escolar Piedras --- tests/bsim/bluetooth/audio/test_scripts/bap_bass_client_sync.sh | 1 + tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio.sh | 2 +- .../audio/test_scripts/bap_broadcast_audio_assistant.sh | 2 +- tests/bsim/bluetooth/audio/test_scripts/cap_broadcast.sh | 1 + .../bsim/bluetooth/audio/test_scripts/cap_capture_and_render.sh | 1 + tests/bsim/bluetooth/audio/test_scripts/cap_unicast.sh | 1 + .../bsim/bluetooth/audio/test_scripts/cap_unicast_ase_error.sh | 1 + tests/bsim/bluetooth/audio/test_scripts/cap_unicast_inval.sh | 1 + tests/bsim/bluetooth/audio/test_scripts/cap_unicast_timeout.sh | 1 + tests/bsim/bluetooth/audio/test_scripts/csip_encrypted_sirk.sh | 1 + tests/bsim/bluetooth/audio/test_scripts/csip_forced_release.sh | 1 + tests/bsim/bluetooth/audio/test_scripts/csip_new_sirk.sh | 1 + tests/bsim/bluetooth/audio/test_scripts/csip_no_lock.sh | 1 + tests/bsim/bluetooth/audio/test_scripts/csip_no_rank.sh | 1 + tests/bsim/bluetooth/audio/test_scripts/csip_no_size.sh | 2 +- tests/bsim/bluetooth/audio/test_scripts/tbs.sh | 1 + .../bluetooth/audio_samples/cap/tests_scripts/cap_broadcast.sh | 1 + .../bluetooth/audio_samples/cap/tests_scripts/cap_unicast.sh | 1 + 18 files changed, 18 insertions(+), 3 deletions(-) diff --git a/tests/bsim/bluetooth/audio/test_scripts/bap_bass_client_sync.sh b/tests/bsim/bluetooth/audio/test_scripts/bap_bass_client_sync.sh index 8491ec5427de85..4abb84f870d4ad 100755 --- a/tests/bsim/bluetooth/audio/test_scripts/bap_bass_client_sync.sh +++ b/tests/bsim/bluetooth/audio/test_scripts/bap_bass_client_sync.sh @@ -6,6 +6,7 @@ SIMULATION_ID="bass_client_sync" VERBOSITY_LEVEL=2 +EXECUTE_TIMEOUT=120 source ${ZEPHYR_BASE}/tests/bsim/sh_common.source diff --git a/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio.sh b/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio.sh index 4988a86e36fcea..5b722cac84b4b7 100755 --- a/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio.sh +++ b/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio.sh @@ -5,7 +5,7 @@ # SPDX-License-Identifier: Apache-2.0 VERBOSITY_LEVEL=2 -EXECUTE_TIMEOUT=100 +EXECUTE_TIMEOUT=240 source ${ZEPHYR_BASE}/tests/bsim/sh_common.source diff --git a/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant.sh b/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant.sh index 497a21a5f740a0..f6333809f424fd 100755 --- a/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant.sh +++ b/tests/bsim/bluetooth/audio/test_scripts/bap_broadcast_audio_assistant.sh @@ -6,7 +6,7 @@ SIMULATION_ID="bap_broadcast_audio_assistant" VERBOSITY_LEVEL=2 -EXECUTE_TIMEOUT=100 +EXECUTE_TIMEOUT=240 source ${ZEPHYR_BASE}/tests/bsim/sh_common.source diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_broadcast.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_broadcast.sh index ffda4da2a4dc7d..16fb153a5747bd 100755 --- a/tests/bsim/bluetooth/audio/test_scripts/cap_broadcast.sh +++ b/tests/bsim/bluetooth/audio/test_scripts/cap_broadcast.sh @@ -6,6 +6,7 @@ SIMULATION_ID="cap_broadcast" VERBOSITY_LEVEL=2 +EXECUTE_TIMEOUT=120 source ${ZEPHYR_BASE}/tests/bsim/sh_common.source diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_capture_and_render.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_capture_and_render.sh index fd65092254a686..7e33c7cfbf2ad5 100755 --- a/tests/bsim/bluetooth/audio/test_scripts/cap_capture_and_render.sh +++ b/tests/bsim/bluetooth/audio/test_scripts/cap_capture_and_render.sh @@ -6,6 +6,7 @@ SIMULATION_ID="cap_capture_and_render" VERBOSITY_LEVEL=2 +EXECUTE_TIMEOUT=120 source ${ZEPHYR_BASE}/tests/bsim/sh_common.source diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast.sh index e833ecad1acb48..7a097943a67883 100755 --- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast.sh +++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast.sh @@ -6,6 +6,7 @@ SIMULATION_ID="cap_unicast" VERBOSITY_LEVEL=2 +EXECUTE_TIMEOUT=240 source ${ZEPHYR_BASE}/tests/bsim/sh_common.source diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ase_error.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ase_error.sh index b6faaddfd6e03a..7ad23e2863a00a 100755 --- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ase_error.sh +++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_ase_error.sh @@ -6,6 +6,7 @@ SIMULATION_ID="cap_unicast_ase_error" VERBOSITY_LEVEL=2 +EXECUTE_TIMEOUT=120 source ${ZEPHYR_BASE}/tests/bsim/sh_common.source diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_inval.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_inval.sh index 6915fe23dd8e41..e45fb8a27a8ce1 100755 --- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_inval.sh +++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_inval.sh @@ -6,6 +6,7 @@ SIMULATION_ID="cap_unicast_inval" VERBOSITY_LEVEL=2 +EXECUTE_TIMEOUT=120 source ${ZEPHYR_BASE}/tests/bsim/sh_common.source diff --git a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_timeout.sh b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_timeout.sh index cdfec802536718..e1716cad2ae4ba 100755 --- a/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_timeout.sh +++ b/tests/bsim/bluetooth/audio/test_scripts/cap_unicast_timeout.sh @@ -6,6 +6,7 @@ SIMULATION_ID="cap_unicast_timeout" VERBOSITY_LEVEL=2 +EXECUTE_TIMEOUT=240 source ${ZEPHYR_BASE}/tests/bsim/sh_common.source diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_encrypted_sirk.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_encrypted_sirk.sh index a33113e381a42a..08e5ed82d6279b 100755 --- a/tests/bsim/bluetooth/audio/test_scripts/csip_encrypted_sirk.sh +++ b/tests/bsim/bluetooth/audio/test_scripts/csip_encrypted_sirk.sh @@ -9,6 +9,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source VERBOSITY_LEVEL=2 +EXECUTE_TIMEOUT=120 cd ${BSIM_OUT_PATH}/bin diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_forced_release.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_forced_release.sh index 380278f2bddaba..d7cd32365e82ac 100755 --- a/tests/bsim/bluetooth/audio/test_scripts/csip_forced_release.sh +++ b/tests/bsim/bluetooth/audio/test_scripts/csip_forced_release.sh @@ -9,6 +9,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source VERBOSITY_LEVEL=2 +EXECUTE_TIMEOUT=120 cd ${BSIM_OUT_PATH}/bin diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_new_sirk.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_new_sirk.sh index 74d88e4848f8a5..84c36fc674fb2b 100755 --- a/tests/bsim/bluetooth/audio/test_scripts/csip_new_sirk.sh +++ b/tests/bsim/bluetooth/audio/test_scripts/csip_new_sirk.sh @@ -10,6 +10,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source VERBOSITY_LEVEL=2 +EXECUTE_TIMEOUT=120 cd ${BSIM_OUT_PATH}/bin diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_no_lock.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_no_lock.sh index 4ee30c09010710..17fe61052a7fdd 100755 --- a/tests/bsim/bluetooth/audio/test_scripts/csip_no_lock.sh +++ b/tests/bsim/bluetooth/audio/test_scripts/csip_no_lock.sh @@ -9,6 +9,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source VERBOSITY_LEVEL=2 +EXECUTE_TIMEOUT=120 cd ${BSIM_OUT_PATH}/bin diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_no_rank.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_no_rank.sh index 8666d5fb5d4421..54adbad5692940 100755 --- a/tests/bsim/bluetooth/audio/test_scripts/csip_no_rank.sh +++ b/tests/bsim/bluetooth/audio/test_scripts/csip_no_rank.sh @@ -9,6 +9,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source VERBOSITY_LEVEL=2 +EXECUTE_TIMEOUT=120 cd ${BSIM_OUT_PATH}/bin diff --git a/tests/bsim/bluetooth/audio/test_scripts/csip_no_size.sh b/tests/bsim/bluetooth/audio/test_scripts/csip_no_size.sh index a566cec1f210b0..bd04c4c39683e9 100755 --- a/tests/bsim/bluetooth/audio/test_scripts/csip_no_size.sh +++ b/tests/bsim/bluetooth/audio/test_scripts/csip_no_size.sh @@ -9,7 +9,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source VERBOSITY_LEVEL=2 -EXECUTE_TIMEOUT=60 +EXECUTE_TIMEOUT=180 cd ${BSIM_OUT_PATH}/bin diff --git a/tests/bsim/bluetooth/audio/test_scripts/tbs.sh b/tests/bsim/bluetooth/audio/test_scripts/tbs.sh index 0662346a5355d8..6344ff2aaed303 100755 --- a/tests/bsim/bluetooth/audio/test_scripts/tbs.sh +++ b/tests/bsim/bluetooth/audio/test_scripts/tbs.sh @@ -9,6 +9,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source SIMULATION_ID="tbs_ccp" VERBOSITY_LEVEL=2 +EXECUTE_TIMEOUT=120 cd ${BSIM_OUT_PATH}/bin diff --git a/tests/bsim/bluetooth/audio_samples/cap/tests_scripts/cap_broadcast.sh b/tests/bsim/bluetooth/audio_samples/cap/tests_scripts/cap_broadcast.sh index 7dcdc23c8595e2..1791b48ed67f5f 100755 --- a/tests/bsim/bluetooth/audio_samples/cap/tests_scripts/cap_broadcast.sh +++ b/tests/bsim/bluetooth/audio_samples/cap/tests_scripts/cap_broadcast.sh @@ -9,6 +9,7 @@ simulation_id="cap_broadcast_test" verbosity_level=2 +EXECUTE_TIMEOUT=120 source ${ZEPHYR_BASE}/tests/bsim/sh_common.source diff --git a/tests/bsim/bluetooth/audio_samples/cap/tests_scripts/cap_unicast.sh b/tests/bsim/bluetooth/audio_samples/cap/tests_scripts/cap_unicast.sh index aac786f791b2d5..cc9d9fc9c83e5d 100755 --- a/tests/bsim/bluetooth/audio_samples/cap/tests_scripts/cap_unicast.sh +++ b/tests/bsim/bluetooth/audio_samples/cap/tests_scripts/cap_unicast.sh @@ -9,6 +9,7 @@ simulation_id="cap_unicast_test" verbosity_level=2 +EXECUTE_TIMEOUT=120 source ${ZEPHYR_BASE}/tests/bsim/sh_common.source From 09b5e7afcd83d0c9ebf0ddee0403907bef195ec4 Mon Sep 17 00:00:00 2001 From: Alberto Escolar Piedras Date: Tue, 5 Nov 2024 14:28:02 +0100 Subject: [PATCH 4/5] tests/bsim/bluetooth/host: Increase EXECUTION_TIMEOUT where needed Increase the EXECUTION_TIMEOUT (real time timeout at which the test will be killed), so we have more margin for CI. Signed-off-by: Alberto Escolar Piedras --- tests/bsim/bluetooth/host/att/pipeline/test_scripts/run.sh | 1 + .../run_test_tolerate_pipeline_variant_rx_tx_prio_invert.sh | 1 + tests/bsim/bluetooth/host/att/timeout/test_scripts/run.sh | 1 + .../bluetooth/host/gatt/ccc_store/test_scripts/ccc_store.sh | 1 + .../bluetooth/host/gatt/ccc_store/test_scripts/ccc_store_2.sh | 1 + tests/bsim/bluetooth/host/iso/cis/tests_scripts/cis_disable.sh | 1 + tests/bsim/bluetooth/host/misc/acl_tx_frag/test_scripts/run.sh | 1 + .../bluetooth/host/privacy/peripheral/test_scripts/run_test.sh | 2 +- .../privacy/peripheral/test_scripts/run_test_rpa_expired.sh | 2 +- .../privacy/peripheral/test_scripts/run_test_rpa_sharing.sh | 2 +- 10 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tests/bsim/bluetooth/host/att/pipeline/test_scripts/run.sh b/tests/bsim/bluetooth/host/att/pipeline/test_scripts/run.sh index a31fa94d7da5ca..dba6867a3aabb0 100755 --- a/tests/bsim/bluetooth/host/att/pipeline/test_scripts/run.sh +++ b/tests/bsim/bluetooth/host/att/pipeline/test_scripts/run.sh @@ -10,6 +10,7 @@ tester_exe="bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_pipeline_tester_prj_con simulation_id="att_pipeline" verbosity_level=2 sim_length_us=100e6 +EXECUTE_TIMEOUT=240 cd ${BSIM_OUT_PATH}/bin diff --git a/tests/bsim/bluetooth/host/att/pipeline/test_scripts/run_test_tolerate_pipeline_variant_rx_tx_prio_invert.sh b/tests/bsim/bluetooth/host/att/pipeline/test_scripts/run_test_tolerate_pipeline_variant_rx_tx_prio_invert.sh index bc7928e349f52f..d5d90c645d34e4 100755 --- a/tests/bsim/bluetooth/host/att/pipeline/test_scripts/run_test_tolerate_pipeline_variant_rx_tx_prio_invert.sh +++ b/tests/bsim/bluetooth/host/att/pipeline/test_scripts/run_test_tolerate_pipeline_variant_rx_tx_prio_invert.sh @@ -37,6 +37,7 @@ tester_exe="bs_${BOARD_TS}_tests_bsim_bluetooth_host_att_pipeline_tester_prj_con simulation_id="att_pipeline_test_tolerate_pipeline_variant_rx_tx_prio_invert" verbosity_level=2 sim_length_us=100e6 +EXECUTE_TIMEOUT=240 cd ${BSIM_OUT_PATH}/bin diff --git a/tests/bsim/bluetooth/host/att/timeout/test_scripts/run.sh b/tests/bsim/bluetooth/host/att/timeout/test_scripts/run.sh index bda0787f0746c5..1a28986ba6b1d8 100755 --- a/tests/bsim/bluetooth/host/att/timeout/test_scripts/run.sh +++ b/tests/bsim/bluetooth/host/att/timeout/test_scripts/run.sh @@ -5,6 +5,7 @@ set -eu -x source ${ZEPHYR_BASE}/tests/bsim/sh_common.source +EXECUTE_TIMEOUT=120 simulation_id="timeout" dev_exe=bs_${BOARD_TS}_$(guess_test_long_name)_prj_conf diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store.sh b/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store.sh index c1bc4469739aba..e09177ef122ee1 100755 --- a/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store.sh +++ b/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store.sh @@ -7,6 +7,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source test_exe="bs_${BOARD_TS}_$(guess_test_long_name)_prj_conf" simulation_id="ccc_store" verbosity_level=2 +EXECUTE_TIMEOUT=60 cd ${BSIM_OUT_PATH}/bin diff --git a/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store_2.sh b/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store_2.sh index 5eb1219913da1c..29befb8660265f 100755 --- a/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store_2.sh +++ b/tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store_2.sh @@ -7,6 +7,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source test_exe="bs_${BOARD_TS}_$(guess_test_long_name)_prj_2_conf" simulation_id="ccc_store_2" verbosity_level=2 +EXECUTE_TIMEOUT=60 cd ${BSIM_OUT_PATH}/bin diff --git a/tests/bsim/bluetooth/host/iso/cis/tests_scripts/cis_disable.sh b/tests/bsim/bluetooth/host/iso/cis/tests_scripts/cis_disable.sh index dfd2d8d11e2240..cb20190d668fb9 100755 --- a/tests/bsim/bluetooth/host/iso/cis/tests_scripts/cis_disable.sh +++ b/tests/bsim/bluetooth/host/iso/cis/tests_scripts/cis_disable.sh @@ -6,6 +6,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source simulation_id="iso_cis_disable" verbosity_level=2 +EXECUTE_TIMEOUT=120 cd ${BSIM_OUT_PATH}/bin diff --git a/tests/bsim/bluetooth/host/misc/acl_tx_frag/test_scripts/run.sh b/tests/bsim/bluetooth/host/misc/acl_tx_frag/test_scripts/run.sh index 91eee9a078e07a..e742f59b18f000 100755 --- a/tests/bsim/bluetooth/host/misc/acl_tx_frag/test_scripts/run.sh +++ b/tests/bsim/bluetooth/host/misc/acl_tx_frag/test_scripts/run.sh @@ -9,6 +9,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source test_name="$(guess_test_long_name)" simulation_id=${test_name} verbosity_level=2 +EXECUTE_TIMEOUT=120 # sixty-second (maximum) sim time. # The test will exit simulation as soon as it has passed. diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/run_test.sh b/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/run_test.sh index d63d3da3eb8781..f813bf1d86f59a 100755 --- a/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/run_test.sh +++ b/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/run_test.sh @@ -7,7 +7,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source verbosity_level=2 simulation_id="host_privacy_peripheral" -EXECUTE_TIMEOUT=100 +EXECUTE_TIMEOUT=240 central_exe="${BSIM_OUT_PATH}/bin/bs_${BOARD_TS}_$(guess_test_long_name)_prj_conf" peripheral_exe="${central_exe}" diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/run_test_rpa_expired.sh b/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/run_test_rpa_expired.sh index 0560dd562b1702..90cb146fe798fa 100755 --- a/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/run_test_rpa_expired.sh +++ b/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/run_test_rpa_expired.sh @@ -7,7 +7,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source verbosity_level=2 simulation_id="rpa_expired" -EXECUTE_TIMEOUT=100 +EXECUTE_TIMEOUT=240 central_exe_rpa_expired="\ ${BSIM_OUT_PATH}/bin/bs_${BOARD_TS}_$(guess_test_long_name)_prj_rpa_expired_conf" diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/run_test_rpa_sharing.sh b/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/run_test_rpa_sharing.sh index 2f08758dc34f81..49daf4e5a86db8 100755 --- a/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/run_test_rpa_sharing.sh +++ b/tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/run_test_rpa_sharing.sh @@ -7,7 +7,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source verbosity_level=2 simulation_id="$(guess_test_long_name)_rpa_sharing" -EXECUTE_TIMEOUT=60 +EXECUTE_TIMEOUT=240 central_exe_rpa_sharing="\ ${BSIM_OUT_PATH}/bin/bs_${BOARD_TS}_$(guess_test_long_name)_prj_rpa_sharing_conf" From c73ada6e84eaa550c832da285156eb0bd0bdc779 Mon Sep 17 00:00:00 2001 From: Alberto Escolar Piedras Date: Tue, 5 Nov 2024 14:28:30 +0100 Subject: [PATCH 5/5] tests/bsim/bluetooth/ll: Increase EXECUTION_TIMEOUT where needed Increase the EXECUTION_TIMEOUT (real time timeout at which the test will be killed), so we have more margin for CI. Signed-off-by: Alberto Escolar Piedras --- tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso.sh | 1 + .../ll/bis/tests_scripts/broadcast_iso_scan_aux_use_chains.sh | 1 + .../ll/bis/tests_scripts/broadcast_iso_ticker_expire_info.sh | 1 + tests/bsim/bluetooth/ll/cis/tests_scripts/connected_iso.sh | 2 +- .../bluetooth/ll/cis/tests_scripts/connected_iso_legacy_adv.sh | 2 +- .../ll/cis/tests_scripts/connected_iso_peripheral_cis.sh | 2 +- .../bluetooth/ll/conn/tests_scripts/basic_conn_split_1ms.sh | 1 + tests/bsim/bluetooth/ll/throughput/tests_scripts/gatt_write.sh | 2 +- 8 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso.sh b/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso.sh index b9177ed58179fa..97f8f4636c68d0 100755 --- a/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso.sh +++ b/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso.sh @@ -8,6 +8,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source # to the BIS. simulation_id="broadcast_iso" verbosity_level=2 +EXECUTE_TIMEOUT=120 cd ${BSIM_OUT_PATH}/bin diff --git a/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_scan_aux_use_chains.sh b/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_scan_aux_use_chains.sh index 310a98d082ab8d..40c3fa00aad6df 100755 --- a/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_scan_aux_use_chains.sh +++ b/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_scan_aux_use_chains.sh @@ -8,6 +8,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source # to the BIS. simulation_id="broadcast_iso_scan_aux_use_chains" verbosity_level=2 +EXECUTE_TIMEOUT=120 cd ${BSIM_OUT_PATH}/bin diff --git a/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_ticker_expire_info.sh b/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_ticker_expire_info.sh index 8c9daf10bb99d4..fd558598b1dae1 100755 --- a/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_ticker_expire_info.sh +++ b/tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_ticker_expire_info.sh @@ -8,6 +8,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source # to the BIS. simulation_id="broadcast_iso_ticker_expire_info" verbosity_level=2 +EXECUTE_TIMEOUT=120 cd ${BSIM_OUT_PATH}/bin diff --git a/tests/bsim/bluetooth/ll/cis/tests_scripts/connected_iso.sh b/tests/bsim/bluetooth/ll/cis/tests_scripts/connected_iso.sh index fe8e1185608726..c6f4345a7f8862 100755 --- a/tests/bsim/bluetooth/ll/cis/tests_scripts/connected_iso.sh +++ b/tests/bsim/bluetooth/ll/cis/tests_scripts/connected_iso.sh @@ -8,7 +8,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source # 1 CIS each to 9 Peripherals (9 CIS in a CIG) simulation_id="connected_iso" verbosity_level=2 -EXECUTE_TIMEOUT=200 +EXECUTE_TIMEOUT=600 cd ${BSIM_OUT_PATH}/bin diff --git a/tests/bsim/bluetooth/ll/cis/tests_scripts/connected_iso_legacy_adv.sh b/tests/bsim/bluetooth/ll/cis/tests_scripts/connected_iso_legacy_adv.sh index 5574a0cbecf251..d8925ed616d40b 100755 --- a/tests/bsim/bluetooth/ll/cis/tests_scripts/connected_iso_legacy_adv.sh +++ b/tests/bsim/bluetooth/ll/cis/tests_scripts/connected_iso_legacy_adv.sh @@ -8,7 +8,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source # 1 CIS each to 9 Peripherals (9 CIS in a CIG) simulation_id="connected_iso_legacy_adv" verbosity_level=2 -EXECUTE_TIMEOUT=200 +EXECUTE_TIMEOUT=500 cd ${BSIM_OUT_PATH}/bin diff --git a/tests/bsim/bluetooth/ll/cis/tests_scripts/connected_iso_peripheral_cis.sh b/tests/bsim/bluetooth/ll/cis/tests_scripts/connected_iso_peripheral_cis.sh index ab1e5c723927ed..63bf63ce11f3d4 100755 --- a/tests/bsim/bluetooth/ll/cis/tests_scripts/connected_iso_peripheral_cis.sh +++ b/tests/bsim/bluetooth/ll/cis/tests_scripts/connected_iso_peripheral_cis.sh @@ -7,7 +7,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source # Basic Connected ISO test: multiple peripheral CIS establishment simulation_id="connected_iso_peripheral_cis" verbosity_level=2 -EXECUTE_TIMEOUT=100 +EXECUTE_TIMEOUT=240 cd ${BSIM_OUT_PATH}/bin diff --git a/tests/bsim/bluetooth/ll/conn/tests_scripts/basic_conn_split_1ms.sh b/tests/bsim/bluetooth/ll/conn/tests_scripts/basic_conn_split_1ms.sh index 0be845f12d67f4..3636ed90380f0d 100755 --- a/tests/bsim/bluetooth/ll/conn/tests_scripts/basic_conn_split_1ms.sh +++ b/tests/bsim/bluetooth/ll/conn/tests_scripts/basic_conn_split_1ms.sh @@ -9,6 +9,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source # interval simulation_id="basic_conn_split_1ms" verbosity_level=2 +EXECUTE_TIMEOUT=120 cd ${BSIM_OUT_PATH}/bin diff --git a/tests/bsim/bluetooth/ll/throughput/tests_scripts/gatt_write.sh b/tests/bsim/bluetooth/ll/throughput/tests_scripts/gatt_write.sh index ff79071857f0c1..12881ee88c0751 100755 --- a/tests/bsim/bluetooth/ll/throughput/tests_scripts/gatt_write.sh +++ b/tests/bsim/bluetooth/ll/throughput/tests_scripts/gatt_write.sh @@ -6,7 +6,7 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source simulation_id="ll-throughput" verbosity_level=2 -EXECUTE_TIMEOUT=60 +EXECUTE_TIMEOUT=240 cd ${BSIM_OUT_PATH}/bin