Skip to content

Commit 86b6800

Browse files
alxelaxcarlescufi
alxelax
authored and
carlescufi
committed
tests: Bluetooth: Mesh: move semaphores out bsim initializations
It is not correctly to call Zephyr API from bsim HW thread. Commit moves friendship test suite semaphores initialization into test bodies. Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
1 parent 5740997 commit 86b6800

File tree

1 file changed

+22
-19
lines changed

1 file changed

+22
-19
lines changed

‎tests/bsim/bluetooth/mesh/src/test_friendship.c‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,9 @@ static uint8_t test_va_col_uuid[][16] = {
4747
};
4848
static uint16_t test_va_col_addr = 0x809D;
4949

50-
static void test_common_init(const struct bt_mesh_test_cfg *cfg)
51-
{
52-
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
53-
54-
bt_mesh_test_cfg_set(cfg, WAIT_TIME);
55-
}
56-
5750
static void test_friend_init(void)
5851
{
59-
test_common_init(&friend_cfg);
52+
bt_mesh_test_cfg_set(&friend_cfg, WAIT_TIME);
6053
}
6154

6255
static void test_lpn_init(void)
@@ -67,12 +60,12 @@ static void test_lpn_init(void)
6760
*/
6861
lpn_cfg.addr = LPN_ADDR_START + get_device_nbr();
6962
lpn_cfg.dev_key[0] = get_device_nbr();
70-
test_common_init(&lpn_cfg);
63+
bt_mesh_test_cfg_set(&lpn_cfg, WAIT_TIME);
7164
}
7265

7366
static void test_other_init(void)
7467
{
75-
test_common_init(&other_cfg);
68+
bt_mesh_test_cfg_set(&other_cfg, WAIT_TIME);
7669
}
7770

7871
static void friend_wait_for_polls(int polls)
@@ -104,7 +97,7 @@ static void friend_wait_for_polls(int polls)
10497
static void test_friend_est(void)
10598
{
10699
bt_mesh_test_setup();
107-
100+
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
108101
bt_mesh_friend_set(BT_MESH_FEATURE_ENABLED);
109102

110103
ASSERT_OK_MSG(bt_mesh_test_friendship_evt_wait(BT_MESH_TEST_FRIEND_ESTABLISHED,
@@ -124,9 +117,7 @@ static void test_friend_est_multi(void)
124117
int err;
125118

126119
bt_mesh_test_setup();
127-
128120
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
129-
130121
bt_mesh_friend_set(BT_MESH_FEATURE_ENABLED);
131122

132123
for (int i = 0; i < CONFIG_BT_MESH_FRIEND_LPN_COUNT; i++) {
@@ -152,7 +143,7 @@ static void test_friend_est_multi(void)
152143
static void test_friend_msg(void)
153144
{
154145
bt_mesh_test_setup();
155-
146+
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
156147
bt_mesh_friend_set(BT_MESH_FEATURE_ENABLED);
157148

158149
ASSERT_OK_MSG(bt_mesh_test_friendship_evt_wait(BT_MESH_TEST_FRIEND_ESTABLISHED,
@@ -220,7 +211,7 @@ static void test_friend_msg(void)
220211
static void test_friend_overflow(void)
221212
{
222213
bt_mesh_test_setup();
223-
214+
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
224215
bt_mesh_friend_set(BT_MESH_FEATURE_ENABLED);
225216

226217
ASSERT_OK_MSG(bt_mesh_test_friendship_evt_wait(BT_MESH_TEST_FRIEND_ESTABLISHED,
@@ -305,7 +296,7 @@ static void test_friend_group(void)
305296
const struct bt_mesh_va *va;
306297

307298
bt_mesh_test_setup();
308-
299+
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
309300
bt_mesh_friend_set(BT_MESH_FEATURE_ENABLED);
310301

311302
ASSERT_OK_MSG(bt_mesh_test_friendship_evt_wait(BT_MESH_TEST_FRIEND_ESTABLISHED,
@@ -354,6 +345,7 @@ static void test_friend_group(void)
354345
static void test_friend_no_est(void)
355346
{
356347
bt_mesh_test_setup();
348+
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
357349
bt_mesh_friend_set(BT_MESH_FEATURE_ENABLED);
358350

359351
if (!bt_mesh_test_friendship_evt_wait(BT_MESH_TEST_FRIEND_ESTABLISHED,
@@ -371,7 +363,7 @@ static void test_friend_va_collision(void)
371363
const struct bt_mesh_va *va[2];
372364

373365
bt_mesh_test_setup();
374-
366+
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
375367
bt_mesh_friend_set(BT_MESH_FEATURE_ENABLED);
376368

377369
ASSERT_OK_MSG(bt_mesh_test_friendship_evt_wait(BT_MESH_TEST_FRIEND_ESTABLISHED,
@@ -446,6 +438,7 @@ static void test_friend_va_collision(void)
446438
static void test_lpn_est(void)
447439
{
448440
bt_mesh_test_setup();
441+
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
449442

450443
/* This test is used to establish friendship with single lpn as well as
451444
* with many lpn devices. If legacy advertiser is used friendship with
@@ -477,7 +470,7 @@ static void test_lpn_est(void)
477470
static void test_lpn_msg_frnd(void)
478471
{
479472
bt_mesh_test_setup();
480-
473+
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
481474
bt_mesh_lpn_set(true);
482475

483476
ASSERT_OK_MSG(bt_mesh_test_friendship_evt_wait(BT_MESH_TEST_LPN_ESTABLISHED,
@@ -541,7 +534,7 @@ static void test_lpn_msg_frnd(void)
541534
static void test_lpn_msg_mesh(void)
542535
{
543536
bt_mesh_test_setup();
544-
537+
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
545538
bt_mesh_lpn_set(true);
546539

547540
ASSERT_OK_MSG(bt_mesh_test_friendship_evt_wait(BT_MESH_TEST_LPN_ESTABLISHED,
@@ -585,6 +578,7 @@ static void test_lpn_msg_mesh(void)
585578
static void test_lpn_re_est(void)
586579
{
587580
bt_mesh_test_setup();
581+
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
588582

589583
for (int i = 0; i < 4; i++) {
590584
bt_mesh_lpn_set(true);
@@ -609,6 +603,7 @@ static void test_lpn_re_est(void)
609603
static void test_lpn_poll(void)
610604
{
611605
bt_mesh_test_setup();
606+
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
612607

613608
bt_mesh_lpn_set(true);
614609
ASSERT_OK_MSG(bt_mesh_test_friendship_evt_wait(BT_MESH_TEST_LPN_ESTABLISHED,
@@ -637,6 +632,7 @@ static void test_lpn_overflow(void)
637632
int err;
638633

639634
bt_mesh_test_setup();
635+
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
640636

641637
bt_mesh_lpn_set(true);
642638
ASSERT_OK_MSG(bt_mesh_test_friendship_evt_wait(BT_MESH_TEST_LPN_ESTABLISHED,
@@ -751,6 +747,7 @@ static void test_lpn_group(void)
751747
int err;
752748

753749
bt_mesh_test_setup();
750+
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
754751

755752
err = bt_mesh_cfg_cli_mod_sub_add(0, cfg->addr, cfg->addr, GROUP_ADDR,
756753
TEST_MOD_ID, &status);
@@ -856,6 +853,7 @@ static void test_lpn_loopback(void)
856853
int err;
857854

858855
bt_mesh_test_setup();
856+
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
859857

860858
err = bt_mesh_cfg_cli_mod_sub_add(0, cfg->addr, cfg->addr, GROUP_ADDR,
861859
TEST_MOD_ID, &status);
@@ -927,6 +925,7 @@ static void test_other_msg(void)
927925
int err;
928926

929927
bt_mesh_test_setup();
928+
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
930929

931930
/* When this device and a friend device receive segments from LPN both start
932931
* sending data. This device sends transport ack. Friend relays LPN's segment.
@@ -978,6 +977,7 @@ static void test_other_group(void)
978977
const struct bt_mesh_va *va;
979978

980979
bt_mesh_test_setup();
980+
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
981981

982982
ASSERT_OK(bt_mesh_va_add(test_va_uuid, &va));
983983

@@ -1001,6 +1001,7 @@ static void test_other_group(void)
10011001
static void test_lpn_disable(void)
10021002
{
10031003
bt_mesh_test_setup();
1004+
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
10041005

10051006
bt_mesh_lpn_set(true);
10061007
bt_mesh_lpn_set(false);
@@ -1020,6 +1021,7 @@ static void test_lpn_disable(void)
10201021
static void test_lpn_term_cb_check(void)
10211022
{
10221023
bt_mesh_test_setup();
1024+
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
10231025

10241026
bt_mesh_lpn_set(true);
10251027
ASSERT_OK_MSG(bt_mesh_test_friendship_evt_wait(BT_MESH_TEST_LPN_POLLED,
@@ -1045,6 +1047,7 @@ static void test_lpn_va_collision(void)
10451047
int err;
10461048

10471049
bt_mesh_test_setup();
1050+
bt_mesh_test_friendship_init(CONFIG_BT_MESH_FRIEND_LPN_COUNT);
10481051

10491052
/* Subscripbe LPN on both virtual address with collision. */
10501053
for (int i = 0; i < ARRAY_SIZE(test_va_col_uuid); i++) {

0 commit comments

Comments
 (0)