Skip to content

Commit f7cd6af

Browse files
asbjornsabocarlescufi
authored andcommitted
Bluetooth: Audio: Align time-outs in babblesim tests
Increase the simulation lengths in the test scripts (where needed) to be longer than the WAIT_TIME defined in common.h, so that simulations will not end before the test has a chance to do proper time out. Signed-off-by: Asbjørn Sæbø <[email protected]>
1 parent 4ce354a commit f7cd6af

File tree

5 files changed

+17
-7
lines changed

5 files changed

+17
-7
lines changed

tests/bluetooth/bsim_bt/bsim_test_audio/test_scripts/csis.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
4444
-v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csis \
4545
-RealEncryption=1 -rs=4 -argstest rank 3
4646

47+
# Simulation time should be larger than the WAIT_TIME in common.h
4748
Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
4849
-D=4 -sim_length=60e6 $@
4950

@@ -71,6 +72,7 @@ Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
7172
-v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csis_release \
7273
-RealEncryption=1 -rs=4 -argstest rank 3
7374

75+
# Simulation time should be larger than the WAIT_TIME in common.h
7476
Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
7577
-D=4 -sim_length=60e6 $@
7678

@@ -96,6 +98,7 @@ Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
9698
-v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=3 -testid=csis_enc \
9799
-RealEncryption=1 -rs=4 -argstest rank 3
98100

101+
# Simulation time should be larger than the WAIT_TIME in common.h
99102
Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
100103
-D=4 -sim_length=60e6 $@
101104

tests/bluetooth/bsim_bt/bsim_test_audio/test_scripts/mcs_mcc.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
3232
Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
3333
-v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=mcs -rs=23
3434

35+
# Simulation time should be larger than the WAIT_TIME in common.h
3536
Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
36-
-D=2 -sim_length=20e6 $@
37+
-D=2 -sim_length=60e6 $@
3738

3839
for PROCESS_ID in $PROCESS_IDS; do
3940
wait $PROCESS_ID || let "EXIT_CODE=$?"

tests/bluetooth/bsim_bt/bsim_test_audio/test_scripts/media_controller.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ printf "\n\n======== Running media controller local_player test =========\n\n"
2929
Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
3030
-v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=media_controller_local_player -rs=23
3131

32+
# Simulation time should be larger than the WAIT_TIME in common.h
3233
Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
33-
-D=1 -sim_length=20e6 $@
34+
-D=1 -sim_length=60e6 $@
3435

3536
for PROCESS_ID in $PROCESS_IDS; do
3637
wait $PROCESS_ID || let "EXIT_CODE=$?"
@@ -44,8 +45,9 @@ Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
4445
Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
4546
-v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=media_controller_server -rs=23
4647

48+
# Simulation time should be larger than the WAIT_TIME in common.h
4749
Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
48-
-D=2 -sim_length=20e6 $@
50+
-D=2 -sim_length=60e6 $@
4951

5052
for PROCESS_ID in $PROCESS_IDS; do
5153
wait $PROCESS_ID || let "EXIT_CODE=$?"

tests/bluetooth/bsim_bt/bsim_test_audio/test_scripts/mics.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ printf "\n\n======== Running MICS Server Only (API) test =========\n\n"
2929
Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
3030
-v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=mics_server_only -rs=23
3131

32+
# Simulation time should be larger than the WAIT_TIME in common.h
3233
Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
33-
-D=1 -sim_length=20e6 $@
34+
-D=1 -sim_length=60e6 $@
3435

3536
for PROCESS_ID in $PROCESS_IDS; do
3637
wait $PROCESS_ID || let "EXIT_CODE=$?"
@@ -44,8 +45,9 @@ Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
4445
Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
4546
-v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=mics_client -rs=46
4647

48+
# Simulation time should be larger than the WAIT_TIME in common.h
4749
Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
48-
-D=2 -sim_length=20e6 $@
50+
-D=2 -sim_length=60e6 $@
4951

5052
for PROCESS_ID in $PROCESS_IDS; do
5153
wait $PROCESS_ID || let "EXIT_CODE=$?"

tests/bluetooth/bsim_bt/bsim_test_audio/test_scripts/vcs.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ printf "\n\n======== Running VCS standalone (API) test =========\n\n"
2929
Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
3030
-v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=vcs_standalone -rs=23
3131

32+
# Simulation time should be larger than the WAIT_TIME in common.h
3233
Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
33-
-D=1 -sim_length=20e6 $@
34+
-D=1 -sim_length=60e6 $@
3435

3536
for PROCESS_ID in $PROCESS_IDS; do
3637
wait $PROCESS_ID || let "EXIT_CODE=$?"
@@ -44,8 +45,9 @@ Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
4445
Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
4546
-v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=vcs_client -rs=46
4647

48+
# Simulation time should be larger than the WAIT_TIME in common.h
4749
Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
48-
-D=2 -sim_length=20e6 $@
50+
-D=2 -sim_length=60e6 $@
4951

5052
for PROCESS_ID in $PROCESS_IDS; do
5153
wait $PROCESS_ID || let "EXIT_CODE=$?"

0 commit comments

Comments
 (0)