tests: bsim: bluetooth: run host tests with twister

With added support of running bsim tests with Twister, separate
building command is no longer need as tests can be build and
run with single command.

Signed-off-by: Artur Dobrynin <[email protected]>

Author: ardo-nordic

scripts/pylib/twister/twisterlib/config_parser.py

@@ -200,20 +200,23 @@ def get_scenario(self, name):
                 d[k] = v
 
         harness_config = copy.deepcopy(self.common.get("harness_config", {}))
-        if 'harness_config' in self.scenarios[name]:
+        if "harness_config" in self.scenarios[name]:
             if harness_config:
-                for k, v in self.scenarios[name]['harness_config'].items():
+                for k, v in self.scenarios[name]["harness_config"].items():
                     if k in harness_config:
                         if isinstance(harness_config[k], list):
-                            harness_config[k] += v if isinstance(v, list) else [v]
+                            if d["harness"] == "bsim":
+                                harness_config[k] += v if isinstance(v, list) else [v]
+                            else:
+                                harness_config[k] = v if isinstance(v, list) else [v]
                         else:
                             harness_config[k] = v
                     else:
                         harness_config[k] = v
             else:
-                harness_config = self.scenarios[name]['harness_config']
+                harness_config = self.scenarios[name]["harness_config"]
 
-        d['harness_config'] = harness_config
+        d["harness_config"] = harness_config
 
         # Compile conf files in to a single list. The order to apply them is:
         #  (1) CONF_FILEs extracted from common['extra_args']

scripts/pylib/twister/twisterlib/harness.py

@@ -1015,9 +1015,9 @@ def clean_exes(self):
         self._set_start_time()
 
         try:
-        for exe_path in [self._get_exe_path(i) for i in range(len(self._exe_paths))]:
-            if os.path.exists(exe_path):
-                os.remove(exe_path)
+            for exe_path in [self._get_exe_path(i) for i in range(len(self._exe_paths))]:
+                if os.path.exists(exe_path):
+                    os.remove(exe_path)
         except Exception as e:
             logger.warning(f'Failed to clean up bsim exes: {e}')
 

tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpunet.sh

@@ -13,6 +13,5 @@ export BOARD="${BOARD:-nrf5340bsim/nrf5340/cpunet}"
 source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
 
 ${ZEPHYR_BASE}/tests/bsim/bluetooth/ll/compile.sh
-${ZEPHYR_BASE}/tests/bsim/bluetooth/host/compile.sh
 
 wait_for_background_jobs

tests/bsim/bluetooth/compile.sh

@@ -17,7 +17,6 @@ source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
 # the rest to save a couple of seconds.
 run_in_background ${ZEPHYR_BASE}/tests/bsim/bluetooth/audio/compile.sh
 ${ZEPHYR_BASE}/tests/bsim/bluetooth/audio_samples/compile.sh
-${ZEPHYR_BASE}/tests/bsim/bluetooth/host/compile.sh
 ${ZEPHYR_BASE}/tests/bsim/bluetooth/ll/compile.sh
 ${ZEPHYR_BASE}/tests/bsim/bluetooth/mesh/compile.sh
 ${ZEPHYR_BASE}/tests/bsim/bluetooth/samples/compile.sh

tests/bsim/bluetooth/host/compile.sh

@@ -2,15 +2,3 @@
 # built in the net core)
 # This file is used in CI to select which tests are run
 tests/bsim/bluetooth/ll/
-tests/bsim/bluetooth/host/att/eatt_notif
-tests/bsim/bluetooth/host/misc/disable
-tests/bsim/bluetooth/host/misc/unregister_conn_cb
-tests/bsim/bluetooth/host/adv/periodic
-tests/bsim/bluetooth/host/adv/extended
-tests/bsim/bluetooth/host/adv/chain
-tests/bsim/bluetooth/host/l2cap/send_on_connect
-tests/bsim/bluetooth/host/central
-tests/bsim/bluetooth/host/privacy/central
-tests/bsim/bluetooth/host/gatt/authorization
-tests/bsim/bluetooth/host/gatt/general
-tests/bsim/bluetooth/host/gatt/caching

tests/bsim/bluetooth/tests.nrf5340bsim_nrf5340_cpunet.txt

@@ -19,6 +19,8 @@ RESULTS_FILE=${ZEPHYR_BASE}/bsim_out/bsim_results.bt.52.xml \
 TESTS_FILE=tests/bsim/bluetooth/tests.nrf52bsim.txt \
 tests/bsim/run_parallel.sh
 
+west twister -T ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/ -p nrf52_bsim/native
+
 # nrf5340bsim/nrf5340/cpunet set:
 nice tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpunet.sh
 
@@ -27,6 +29,8 @@ RESULTS_FILE=${ZEPHYR_BASE}/bsim_out/bsim_results.bt.53_cpunet.xml \
 TESTS_FILE=tests/bsim/bluetooth/tests.nrf5340bsim_nrf5340_cpunet.txt \
 tests/bsim/run_parallel.sh
 
+west twister -T ${ZEPHYR_BASE}/tests/bsim/bluetooth/host/ -p nrf5340bsim/nrf5340/cpunet
+
 # nrf5340 split stack set:
 nice tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpuapp.sh