[nrf fromlist] twister: Allow to run sysbuild with native_sim

Fix issue 72083. Update path to zephyr.exe binary using
default domain from domains.yaml file.

Upstream PR: zephyrproject-rtos/zephyr#72100

Signed-off-by: Grzegorz Chwierut <grzegorz.chwierut@nordicsemi.no>

Author: gchwier

scripts/pylib/twister/twisterlib/handlers.py

@@ -75,7 +75,6 @@ def __init__(self, instance, type_str="build"):
         self.run = False
         self.type_str = type_str
 
-        self.binary = None
         self.pid_fn = None
         self.call_make_run = True
 
@@ -167,6 +166,19 @@ def _final_handle_actions(self, harness, handler_time):
 
         self.record(harness)
 
+    def get_default_domain_build_dir(self):
+        if self.instance.testsuite.sysbuild:
+            # Load domain yaml to get default domain build directory
+            # Note: for targets using QEMU, we assume that the target will
+            # have added any additional images to the run target manually
+            domain_path = os.path.join(self.build_dir, "domains.yaml")
+            domains = Domains.from_file(domain_path)
+            logger.debug("Loaded sysbuild domain data from %s" % domain_path)
+            build_dir = domains.get_default_domain().build_dir
+        else:
+            build_dir = self.build_dir
+        return build_dir
+
 
 class BinaryHandler(Handler):
     def __init__(self, instance, type_str):
@@ -239,7 +251,8 @@ def _create_command(self, robot_test):
         elif self.call_make_run:
             command = [self.generator_cmd, "run"]
         else:
-            command = [self.binary]
+            binary = os.path.join(self.get_default_domain_build_dir(), "zephyr", "zephyr.exe")
+            command = [binary]
 
         if self.options.enable_valgrind:
             command = ["valgrind", "--error-exitcode=2",
@@ -344,7 +357,6 @@ def __init__(self, instance, type_str):
             self.pid_fn = os.path.join(instance.build_dir, "renode.pid")
         elif type_str == 'native':
             self.call_make_run = False
-            self.binary = os.path.join(instance.build_dir, "zephyr", "zephyr.exe")
             self.ready = True
 
 
@@ -949,20 +961,6 @@ def _thread(handler, timeout, outdir, logfile, fifo_fn, pid_fn,
 
         QEMUHandler._thread_close_files(fifo_in, fifo_out, pid, out_fp, in_fp, log_out_fp)
 
-    def _get_sysbuild_build_dir(self):
-        if self.instance.testsuite.sysbuild:
-            # Load domain yaml to get default domain build directory
-            # Note: for targets using QEMU, we assume that the target will
-            # have added any additional images to the run target manually
-            domain_path = os.path.join(self.build_dir, "domains.yaml")
-            domains = Domains.from_file(domain_path)
-            logger.debug("Loaded sysbuild domain data from %s" % domain_path)
-            build_dir = domains.get_default_domain().build_dir
-        else:
-            build_dir = self.build_dir
-
-        return build_dir
-
     def _set_qemu_filenames(self, sysbuild_build_dir):
         # We pass this to QEMU which looks for fifos with .in and .out suffixes.
         # QEMU fifo will use main build dir
@@ -994,11 +992,11 @@ def _update_instance_info(self, harness_state, is_timeout):
     def handle(self, harness):
         self.run = True
 
-        sysbuild_build_dir = self._get_sysbuild_build_dir()
+        domain_build_dir = self.get_default_domain_build_dir()
 
-        command = self._create_command(sysbuild_build_dir)
+        command = self._create_command(domain_build_dir)
 
-        self._set_qemu_filenames(sysbuild_build_dir)
+        self._set_qemu_filenames(domain_build_dir)
 
         self.thread = threading.Thread(name=self.name, target=QEMUHandler._thread,
                                        args=(self, self.get_test_timeout(), self.build_dir,
@@ -1138,20 +1136,6 @@ def _monitor_update_instance_info(handler, handler_time, out_state):
             handler.instance.status = out_state
             handler.instance.reason = "Unknown"
 
-    def _get_sysbuild_build_dir(self):
-        if self.instance.testsuite.sysbuild:
-            # Load domain yaml to get default domain build directory
-            # Note: for targets using QEMU, we assume that the target will
-            # have added any additional images to the run target manually
-            domain_path = os.path.join(self.build_dir, "domains.yaml")
-            domains = Domains.from_file(domain_path)
-            logger.debug("Loaded sysbuild domain data from %s" % domain_path)
-            build_dir = domains.get_default_domain().build_dir
-        else:
-            build_dir = self.build_dir
-
-        return build_dir
-
     def _set_qemu_filenames(self, sysbuild_build_dir):
         # PID file will be created in the main sysbuild app's build dir
         self.pid_fn = os.path.join(sysbuild_build_dir, "qemu.pid")
@@ -1291,9 +1275,9 @@ def _monitor_output(self, queue, timeout, logfile, pid_fn, harness, ignore_unexp
     def handle(self, harness):
         self.run = True
 
-        sysbuild_build_dir = self._get_sysbuild_build_dir()
-        command = self._create_command(sysbuild_build_dir)
-        self._set_qemu_filenames(sysbuild_build_dir)
+        domain_build_dir = self.get_default_domain_build_dir()
+        command = self._create_command(domain_build_dir)
+        self._set_qemu_filenames(domain_build_dir)
 
         logger.debug("Running %s (%s)" % (self.name, self.type_str))
         is_timeout = False

scripts/tests/twister/test_handlers.py

@@ -448,7 +448,7 @@ def wait(self, *args, **kwargs):
       '--log-file=build_dir/valgrind.log', '--track-origins=yes',
       'generator', 'run_renode_test']),
     (False, True, False, 123, None, ['generator', 'run', '--seed=123']),
-    (False, False, False, None, ['ex1', 'ex2'], ['bin', 'ex1', 'ex2']),
+    (False, False, False, None, ['ex1', 'ex2'], ['build_dir/zephyr/zephyr.exe', 'ex1', 'ex2']),
 ]
 
 @pytest.mark.parametrize(
@@ -474,6 +474,7 @@ def test_binaryhandler_create_command(
     handler.seed = seed
     handler.extra_test_args = extra_args
     handler.build_dir = 'build_dir'
+    handler.instance.testsuite.sysbuild = False
 
     command = handler._create_command(robot_test)
 
@@ -1478,7 +1479,7 @@ def mock_process(pid):
     TESTDATA_19,
     ids=['domains build dir', 'self build dir']
 )
-def test_qemuhandler_get_sysbuild_build_dir(
+def test_qemuhandler_get_default_domain_build_dir(
     mocked_instance,
     self_sysbuild,
     self_build_dir,
@@ -1495,7 +1496,7 @@ def test_qemuhandler_get_sysbuild_build_dir(
     handler.build_dir = self_build_dir
 
     with mock.patch('domains.Domains.from_file', from_file_mock):
-        result = handler._get_sysbuild_build_dir()
+        result = handler.get_default_domain_build_dir()
 
     assert result == expected
 
@@ -2017,7 +2018,7 @@ def mock_filenames(sysbuild_build_dir):
     harness = mock.Mock(state=harness_state)
     handler_options_west_flash = []
 
-    sysbuild_build_dir = os.path.join('sysbuild', 'dummydir')
+    domain_build_dir = os.path.join('sysbuild', 'dummydir')
     command = ['generator_cmd', '-C', os.path.join('cmd', 'path'), 'run']
 
     handler.options = mock.Mock(
@@ -2030,7 +2031,7 @@ def mock_filenames(sysbuild_build_dir):
     handler._final_handle_actions = mock.Mock(return_value=None)
     handler._create_command = mock.Mock(return_value=command)
     handler._set_qemu_filenames = mock.Mock(side_effect=mock_filenames)
-    handler._get_sysbuild_build_dir = mock.Mock(return_value=sysbuild_build_dir)
+    handler.get_default_domain_build_dir = mock.Mock(return_value=domain_build_dir)
     handler.terminate = mock.Mock()
 
     unlink_mock = mock.Mock()