Skip to content

Commit 1aa33fe

Browse files
rugeGerritsencarlescufi
rugeGerritsen
authored and
carlescufi
committed
tests: bsim: Use the pre_init_f instead of post_init_f
When using the post_init_f to initialize the `bst_result`, it is not possible to mark the test as passed immediately as the `bst_result` will be initialized after the test completes. This change should overcome this limitation. Bluetooth mesh tests are kept as is as we are not sure if this will change the behavior. Signed-off-by: Rubin Gerritsen <[email protected]>
1 parent 94346d2 commit 1aa33fe

File tree

107 files changed

+237
-237
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+237
-237
lines changed

‎tests/bsim/bluetooth/audio/src/bap_bass_broadcaster_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ static void test_main(void)
7676
static const struct bst_test_instance test_bass_broadcaster[] = {
7777
{
7878
.test_id = "bass_broadcaster",
79-
.test_post_init_f = test_init,
79+
.test_pre_init_f = test_init,
8080
.test_tick_f = test_tick,
8181
.test_main_f = test_main
8282
},

‎tests/bsim/bluetooth/audio/src/bap_broadcast_assistant_test.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -622,19 +622,19 @@ static void test_main_server_sync_server_rem(void)
622622
static const struct bst_test_instance test_bass[] = {
623623
{
624624
.test_id = "bap_broadcast_assistant_client_sync",
625-
.test_post_init_f = test_init,
625+
.test_pre_init_f = test_init,
626626
.test_tick_f = test_tick,
627627
.test_main_f = test_main_client_sync,
628628
},
629629
{
630630
.test_id = "bap_broadcast_assistant_server_sync_client_rem",
631-
.test_post_init_f = test_init,
631+
.test_pre_init_f = test_init,
632632
.test_tick_f = test_tick,
633633
.test_main_f = test_main_server_sync_client_rem,
634634
},
635635
{
636636
.test_id = "bap_broadcast_assistant_server_sync_server_rem",
637-
.test_post_init_f = test_init,
637+
.test_pre_init_f = test_init,
638638
.test_tick_f = test_tick,
639639
.test_main_f = test_main_server_sync_server_rem,
640640
},

‎tests/bsim/bluetooth/audio/src/bap_broadcast_sink_test.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,19 +1041,19 @@ static void broadcast_sink_with_assistant(void)
10411041
static const struct bst_test_instance test_broadcast_sink[] = {
10421042
{
10431043
.test_id = "broadcast_sink",
1044-
.test_post_init_f = test_init,
1044+
.test_pre_init_f = test_init,
10451045
.test_tick_f = test_tick,
10461046
.test_main_f = test_main,
10471047
},
10481048
{
10491049
.test_id = "broadcast_sink_disconnect",
1050-
.test_post_init_f = test_init,
1050+
.test_pre_init_f = test_init,
10511051
.test_tick_f = test_tick,
10521052
.test_main_f = test_sink_disconnect,
10531053
},
10541054
{
10551055
.test_id = "broadcast_sink_with_assistant",
1056-
.test_post_init_f = test_init,
1056+
.test_pre_init_f = test_init,
10571057
.test_tick_f = test_tick,
10581058
.test_main_f = broadcast_sink_with_assistant,
10591059
},

‎tests/bsim/bluetooth/audio/src/bap_broadcast_source_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ static void test_main(void)
518518
static const struct bst_test_instance test_broadcast_source[] = {
519519
{
520520
.test_id = "broadcast_source",
521-
.test_post_init_f = test_init,
521+
.test_pre_init_f = test_init,
522522
.test_tick_f = test_tick,
523523
.test_main_f = test_main
524524
},

‎tests/bsim/bluetooth/audio/src/bap_scan_delegator_test.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -808,19 +808,19 @@ static void test_main_server_sync_server_rem(void)
808808
static const struct bst_test_instance test_scan_delegator[] = {
809809
{
810810
.test_id = "bap_scan_delegator_client_sync",
811-
.test_post_init_f = test_init,
811+
.test_pre_init_f = test_init,
812812
.test_tick_f = test_tick,
813813
.test_main_f = test_main_client_sync,
814814
},
815815
{
816816
.test_id = "bap_scan_delegator_server_sync_client_rem",
817-
.test_post_init_f = test_init,
817+
.test_pre_init_f = test_init,
818818
.test_tick_f = test_tick,
819819
.test_main_f = test_main_server_sync_client_rem,
820820
},
821821
{
822822
.test_id = "bap_scan_delegator_server_sync_server_rem",
823-
.test_post_init_f = test_init,
823+
.test_pre_init_f = test_init,
824824
.test_tick_f = test_tick,
825825
.test_main_f = test_main_server_sync_server_rem,
826826
},

‎tests/bsim/bluetooth/audio/src/bap_unicast_client_test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,13 +1129,13 @@ static void test_main_acl_disconnect(void)
11291129
static const struct bst_test_instance test_unicast_client[] = {
11301130
{
11311131
.test_id = "unicast_client",
1132-
.test_post_init_f = test_init,
1132+
.test_pre_init_f = test_init,
11331133
.test_tick_f = test_tick,
11341134
.test_main_f = test_main,
11351135
},
11361136
{
11371137
.test_id = "unicast_client_acl_disconnect",
1138-
.test_post_init_f = test_init,
1138+
.test_pre_init_f = test_init,
11391139
.test_tick_f = test_tick,
11401140
.test_main_f = test_main_acl_disconnect,
11411141
},

‎tests/bsim/bluetooth/audio/src/bap_unicast_server_test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -600,13 +600,13 @@ static void test_main_acl_disconnect(void)
600600
static const struct bst_test_instance test_unicast_server[] = {
601601
{
602602
.test_id = "unicast_server",
603-
.test_post_init_f = test_init,
603+
.test_pre_init_f = test_init,
604604
.test_tick_f = test_tick,
605605
.test_main_f = test_main,
606606
},
607607
{
608608
.test_id = "unicast_server_acl_disconnect",
609-
.test_post_init_f = test_init,
609+
.test_pre_init_f = test_init,
610610
.test_tick_f = test_tick,
611611
.test_main_f = test_main_acl_disconnect,
612612
},

‎tests/bsim/bluetooth/audio/src/cap_acceptor_test.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -889,25 +889,25 @@ static void test_cap_acceptor_capture_and_render(void)
889889
static const struct bst_test_instance test_cap_acceptor[] = {
890890
{
891891
.test_id = "cap_acceptor_unicast",
892-
.test_post_init_f = test_init,
892+
.test_pre_init_f = test_init,
893893
.test_tick_f = test_tick,
894894
.test_main_f = test_cap_acceptor_unicast,
895895
},
896896
{
897897
.test_id = "cap_acceptor_unicast_timeout",
898-
.test_post_init_f = test_init,
898+
.test_pre_init_f = test_init,
899899
.test_tick_f = test_tick,
900900
.test_main_f = test_cap_acceptor_unicast_timeout,
901901
},
902902
{
903903
.test_id = "cap_acceptor_broadcast",
904-
.test_post_init_f = test_init,
904+
.test_pre_init_f = test_init,
905905
.test_tick_f = test_tick,
906906
.test_main_f = test_cap_acceptor_broadcast,
907907
},
908908
{
909909
.test_id = "cap_acceptor_capture_and_render",
910-
.test_post_init_f = test_init,
910+
.test_pre_init_f = test_init,
911911
.test_tick_f = test_tick,
912912
.test_main_f = test_cap_acceptor_capture_and_render,
913913
},

‎tests/bsim/bluetooth/audio/src/cap_commander_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ static void test_main_cap_commander_capture_and_render(void)
601601
static const struct bst_test_instance test_cap_commander[] = {
602602
{
603603
.test_id = "cap_commander_capture_and_render",
604-
.test_post_init_f = test_init,
604+
.test_pre_init_f = test_init,
605605
.test_tick_f = test_tick,
606606
.test_main_f = test_main_cap_commander_capture_and_render,
607607
},

‎tests/bsim/bluetooth/audio/src/cap_initiator_broadcast_test.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -841,29 +841,29 @@ static void test_args(int argc, char *argv[])
841841
static const struct bst_test_instance test_cap_initiator_broadcast[] = {
842842
{
843843
.test_id = "cap_initiator_broadcast",
844-
.test_post_init_f = test_init,
844+
.test_pre_init_f = test_init,
845845
.test_tick_f = test_tick,
846846
.test_main_f = test_main_cap_initiator_broadcast,
847847
},
848848
{
849849
.test_id = "cap_initiator_ac_12",
850-
.test_post_init_f = test_init,
850+
.test_pre_init_f = test_init,
851851
.test_tick_f = test_tick,
852852
.test_main_f = test_cap_initiator_ac_12,
853853
.test_args_f = test_args,
854854
},
855855
#if BROADCAST_STREMT_CNT >= CAP_AC_MAX_STREAM
856856
{
857857
.test_id = "cap_initiator_ac_13",
858-
.test_post_init_f = test_init,
858+
.test_pre_init_f = test_init,
859859
.test_tick_f = test_tick,
860860
.test_main_f = test_cap_initiator_ac_13,
861861
.test_args_f = test_args,
862862
},
863863
#endif /* BROADCAST_STREMT_CNT >= CAP_AC_MAX_STREAM */
864864
{
865865
.test_id = "cap_initiator_ac_14",
866-
.test_post_init_f = test_init,
866+
.test_pre_init_f = test_init,
867867
.test_tick_f = test_tick,
868868
.test_main_f = test_cap_initiator_ac_14,
869869
.test_args_f = test_args,

0 commit comments

Comments
 (0)