tests/bluetooth/mesh: Synchronize devices before boot

To ensure no indeterminism, synchronize devices before they
boot, and therefore before the test main function is executed.

Note that at this point, there is no actual indeterminism
to correct.

Signed-off-by: Alberto Escolar Piedras <[email protected]>

Author: aescolar

tests/bluetooth/bsim/mesh/_mesh_test.sh

@@ -75,7 +75,7 @@ function RunTest(){
 
     Execute \
       ${exe_name} \
-      -v=${verbosity_level} -s=$s_id -d=$idx -RealEncryption=1 \
+      -v=${verbosity_level} -s=$s_id -d=$idx -sync_preboot -RealEncryption=1 \
       -testid=$testid ${test_options}
     let idx=idx+1
   done

tests/bluetooth/bsim/mesh/src/test_provision.c

@@ -327,16 +327,8 @@ static void oob_auth_set(int test_step)
 
 static void oob_device(bool use_oob_pk)
 {
-	int err = 0;
-
 	k_sem_init(&prov_sem, 0, 1);
 
-	oob_channel_id = bs_open_back_channel(get_device_nbr(),
-			(uint[]){(get_device_nbr() + 1) % 2}, (uint[]){0}, 1);
-	if (!oob_channel_id) {
-		FAIL("Can't open OOB interface (err %d)\n", err);
-	}
-
 	bt_mesh_device_setup(&prov, &comp);
 
 	if (use_oob_pk) {
@@ -366,16 +358,8 @@ static void oob_device(bool use_oob_pk)
 
 static void oob_provisioner(bool read_oob_pk, bool use_oob_pk)
 {
-	int err = 0;
-
 	k_sem_init(&prov_sem, 0, 1);
 
-	oob_channel_id = bs_open_back_channel(get_device_nbr(),
-			(uint[]){(get_device_nbr() + 1) % 2}, (uint[]){0}, 1);
-	if (!oob_channel_id) {
-		FAIL("Can't open OOB interface (err %d)\n", err);
-	}
-
 	bt_mesh_device_setup(&prov, &comp);
 
 	if (read_oob_pk) {
@@ -549,6 +533,15 @@ static void test_provisioner_pb_adv_oob_auth(void)
 	PASS();
 }
 
+static void test_back_channel_pre_init(void)
+{
+	oob_channel_id = bs_open_back_channel(get_device_nbr(),
+			(uint[]){(get_device_nbr() + 1) % 2}, (uint[]){0}, 1);
+	if (!oob_channel_id) {
+		FAIL("Can't open OOB interface\n");
+	}
+}
+
 static void test_device_pb_adv_oob_public_key(void)
 {
 	oob_device(true);
@@ -1196,13 +1189,22 @@ static void test_device_pb_remote_server_ncrp_second_time(void)
 		.test_main_f = test_##role##_##name,                           \
 		.test_delete_f = test_terminate                                \
 	}
+#define TEST_CASE_WBACKCHANNEL(role, name, description)                                     \
+	{                                                                      \
+		.test_id = "prov_" #role "_" #name, .test_descr = description, \
+		.test_post_init_f = test_##role##_init,                        \
+		.test_pre_init_f = test_back_channel_pre_init,                 \
+		.test_tick_f = bt_mesh_test_timeout,                           \
+		.test_main_f = test_##role##_##name,                           \
+		.test_delete_f = test_terminate                                \
+	}
 
 static const struct bst_test_instance test_connect[] = {
 	TEST_CASE(device, pb_adv_no_oob,
 		  "Device: pb-adv provisioning use no-oob method"),
-	TEST_CASE(device, pb_adv_oob_auth,
+	TEST_CASE_WBACKCHANNEL(device, pb_adv_oob_auth,
 		  "Device: pb-adv provisioning use oob authentication"),
-	TEST_CASE(device, pb_adv_oob_public_key,
+	TEST_CASE_WBACKCHANNEL(device, pb_adv_oob_public_key,
 		  "Device: pb-adv provisioning use oob public key"),
 	TEST_CASE(device, pb_adv_reprovision,
 		  "Device: pb-adv provisioning, reprovision"),
@@ -1221,11 +1223,11 @@ static const struct bst_test_instance test_connect[] = {
 		  "Provisioner: effect on ivu_duration when IV Update flag is set to zero"),
 	TEST_CASE(provisioner, iv_update_flag_one,
 		  "Provisioner: effect on ivu_duration when IV Update flag is set to one"),
-	TEST_CASE(provisioner, pb_adv_oob_auth,
+	TEST_CASE_WBACKCHANNEL(provisioner, pb_adv_oob_auth,
 		  "Provisioner: pb-adv provisioning use oob authentication"),
-	TEST_CASE(provisioner, pb_adv_oob_public_key,
+	TEST_CASE_WBACKCHANNEL(provisioner, pb_adv_oob_public_key,
 		  "Provisioner: pb-adv provisioning use oob public key"),
-	TEST_CASE(provisioner, pb_adv_oob_auth_no_oob_public_key,
+	TEST_CASE_WBACKCHANNEL(provisioner, pb_adv_oob_auth_no_oob_public_key,
 		"Provisioner: pb-adv provisioning use oob authentication, ignore oob public key"),
 	TEST_CASE(provisioner, pb_adv_reprovision,
 		  "Provisioner: pb-adv provisioning, resetting and reprovisioning multiple times."),