twister: always call flash directly

Drop the logic to use the generator "flash" target, that is using west
anyway, always call flash directly anyway so that those targets can be
deprecated.

Signed-off-by: Fabio Baltieri <[email protected]>

Author: fabiobaltieri

scripts/pylib/twister/twisterlib/environment.py

@@ -818,14 +818,12 @@ def add_parse_arguments(parser = None) -> argparse.ArgumentParser:
 
     parser.add_argument(
         "--west-flash", nargs='?', const=[],
-        help="""Uses west instead of ninja or make to flash when running with
-             --device-testing. Supports comma-separated argument list.
+        help="""Comma separated list of additional flags passed to west when
+            running with --device-testing.
 
         E.g "twister --device-testing --device-serial /dev/ttyACM0
                          --west-flash="--board-id=foobar,--erase"
         will translate to "west flash -- --board-id=foobar --erase"
-
-        NOTE: device-testing must be enabled to use this option.
         """
     )
     parser.add_argument(
@@ -836,8 +834,6 @@ def add_parse_arguments(parser = None) -> argparse.ArgumentParser:
         E.g "twister --device-testing --device-serial /dev/ttyACM0
                          --west-flash --west-runner=pyocd"
         will translate to "west flash --runner pyocd"
-
-        NOTE: west-flash must be enabled to use this option.
         """
     )
 
@@ -897,14 +893,6 @@ def parse_arguments(
         logger.error("--device-serial-pty is not supported on Windows OS")
         sys.exit(1)
 
-    if options.west_runner and options.west_flash is None:
-        logger.error("west-runner requires west-flash to be enabled")
-        sys.exit(1)
-
-    if options.west_flash and not options.device_testing:
-        logger.error("west-flash requires device-testing to be enabled")
-        sys.exit(1)
-
     if not options.testsuite_root:
         # if we specify a test scenario which is part of a suite directly, do
         # not set testsuite root to default, just point to the test directory

scripts/pylib/twister/twisterlib/handlers.py

@@ -545,68 +545,65 @@ def run_custom_script(script, timeout):
                 logger.error(f"{script} timed out")
 
     def _create_command(self, runner, hardware):
-        if (self.options.west_flash is not None) or runner:
-            command = ["west", "flash", "--skip-rebuild", "-d", self.build_dir]
-            command_extra_args = []
-
-            # There are three ways this option is used.
-            # 1) bare: --west-flash
-            #    This results in options.west_flash == []
-            # 2) with a value: --west-flash="--board-id=42"
-            #    This results in options.west_flash == "--board-id=42"
-            # 3) Multiple values: --west-flash="--board-id=42,--erase"
-            #    This results in options.west_flash == "--board-id=42 --erase"
-            if self.options.west_flash and self.options.west_flash != []:
-                command_extra_args.extend(self.options.west_flash.split(','))
-
-            if runner:
-                command.append("--runner")
-                command.append(runner)
-
-                board_id = hardware.probe_id or hardware.id
-                product = hardware.product
-                if board_id is not None:
-                    if runner in ("pyocd", "nrfjprog", "nrfutil", "nrfutil_next"):
-                        command_extra_args.append("--dev-id")
-                        command_extra_args.append(board_id)
-                    elif runner == "esp32":
-                        command_extra_args.append("--esp-device")
-                        command_extra_args.append(board_id)
-                    elif (
-                        runner == "openocd"
-                        and product == "STM32 STLink"
-                        or runner == "openocd"
-                        and product == "STLINK-V3"
-                    ):
-                        command_extra_args.append("--cmd-pre-init")
-                        command_extra_args.append(f"hla_serial {board_id}")
-                    elif runner == "openocd" and product == "EDBG CMSIS-DAP":
-                        command_extra_args.append("--cmd-pre-init")
-                        command_extra_args.append(f"cmsis_dap_serial {board_id}")
-                    elif runner == "openocd" and product == "LPC-LINK2 CMSIS-DAP":
-                        command_extra_args.append("--cmd-pre-init")
-                        command_extra_args.append(f"adapter serial {board_id}")
-                    elif runner == "jlink":
-                        command.append("--dev-id")
-                        command.append(board_id)
-                    elif runner == "linkserver":
-                        # for linkserver
-                        # --probe=#<number> select by probe index
-                        # --probe=<serial number> select by probe serial number
-                        command.append(f"--probe={board_id}")
-                    elif runner == "stm32cubeprogrammer" and product != "BOOT-SERIAL":
-                        command.append(f"--tool-opt=sn={board_id}")
-
-                    # Receive parameters from runner_params field.
-                    if hardware.runner_params:
-                        for param in hardware.runner_params:
-                            command.append(param)
-
-            if command_extra_args:
-                command.append('--')
-                command.extend(command_extra_args)
-        else:
-            command = [self.generator_cmd, "-C", self.build_dir, "flash"]
+        command = ["west", "flash", "--skip-rebuild", "-d", self.build_dir]
+        command_extra_args = []
+
+        # There are three ways this option is used.
+        # 1) bare: default flags
+        #    This results in options.west_flash == []
+        # 2) with a value: --west-flash="--board-id=42"
+        #    This results in options.west_flash == "--board-id=42"
+        # 3) Multiple values: --west-flash="--board-id=42,--erase"
+        #    This results in options.west_flash == "--board-id=42 --erase"
+        if self.options.west_flash and self.options.west_flash != []:
+            command_extra_args.extend(self.options.west_flash.split(','))
+
+        if runner:
+            command.append("--runner")
+            command.append(runner)
+
+            board_id = hardware.probe_id or hardware.id
+            product = hardware.product
+            if board_id is not None:
+                if runner in ("pyocd", "nrfjprog", "nrfutil", "nrfutil_next"):
+                    command_extra_args.append("--dev-id")
+                    command_extra_args.append(board_id)
+                elif runner == "esp32":
+                    command_extra_args.append("--esp-device")
+                    command_extra_args.append(board_id)
+                elif (
+                    runner == "openocd"
+                    and product == "STM32 STLink"
+                    or runner == "openocd"
+                    and product == "STLINK-V3"
+                ):
+                    command_extra_args.append("--cmd-pre-init")
+                    command_extra_args.append(f"hla_serial {board_id}")
+                elif runner == "openocd" and product == "EDBG CMSIS-DAP":
+                    command_extra_args.append("--cmd-pre-init")
+                    command_extra_args.append(f"cmsis_dap_serial {board_id}")
+                elif runner == "openocd" and product == "LPC-LINK2 CMSIS-DAP":
+                    command_extra_args.append("--cmd-pre-init")
+                    command_extra_args.append(f"adapter serial {board_id}")
+                elif runner == "jlink":
+                    command.append("--dev-id")
+                    command.append(board_id)
+                elif runner == "linkserver":
+                    # for linkserver
+                    # --probe=#<number> select by probe index
+                    # --probe=<serial number> select by probe serial number
+                    command.append(f"--probe={board_id}")
+                elif runner == "stm32cubeprogrammer" and product != "BOOT-SERIAL":
+                    command.append(f"--tool-opt=sn={board_id}")
+
+                # Receive parameters from runner_params field.
+                if hardware.runner_params:
+                    for param in hardware.runner_params:
+                        command.append(param)
+
+        if command_extra_args:
+            command.append('--')
+            command.extend(command_extra_args)
 
         return command
 

scripts/pylib/twister/twisterlib/runner.py

@@ -828,23 +828,6 @@ def parse_generated(self, filter_stages=None):
             filter_data.update(self.defconfig)
         filter_data.update(self.cmake_cache)
 
-        # Verify that twister's arguments support sysbuild.
-        # Twister sysbuild flashing currently only works with west,
-        # so --west-flash must be passed.
-        if (
-            self.instance.sysbuild
-            and self.env.options.device_testing
-            and self.env.options.west_flash is None
-        ):
-            logger.warning("Sysbuild test will be skipped. West must be used for flashing.")
-            return {
-                os.path.join(
-                    self.platform.name,
-                    self.instance.toolchain,
-                    self.testsuite.name
-                ): True
-            }
-
         if self.testsuite and self.testsuite.filter:
             try:
                 if os.path.exists(edt_pickle):

scripts/tests/twister/test_environment.py

@@ -32,20 +32,6 @@
         ['--device-serial-pty', 'dummy'],
         '--device-serial-pty is not supported on Windows OS'
     ),
-    (
-        None,
-        None,
-        None,
-        ['--west-runner=dummy'],
-        'west-runner requires west-flash to be enabled'
-    ),
-    (
-        None,
-        None,
-        None,
-        ['--west-flash=\"--board-id=dummy\"'],
-        'west-flash requires device-testing to be enabled'
-    ),
     (
         None,
         {
@@ -136,8 +122,6 @@
     ids=[
         'short build path without ninja',
         'device-serial-pty on Windows',
-        'west runner without west flash',
-        'west-flash without device-testing',
         'valgrind without executable',
         'device serial without platform',
         'device serial with multiple platforms',

scripts/tests/twister/test_handlers.py

@@ -1061,7 +1061,7 @@ def mock_availability(handler, instance, no=num_of_failures):
         None,
         None,
         None,
-        ['generator_cmd', '-C', '$build_dir', 'flash']
+        ['west', 'flash', '--skip-rebuild', '-d', '$build_dir']
     ),
     (
         [],
@@ -1155,7 +1155,7 @@ def mock_availability(handler, instance, no=num_of_failures):
     'self_west_flash, runner,' \
     ' hardware_product_name, expected',
     TESTDATA_13,
-    ids=['generator', '--west-flash', 'one west flash value',
+    ids=['default', '--west-flash', 'one west flash value',
          'multiple west flash values', 'generic runner', 'pyocd',
          'nrfjprog', 'openocd, STM32 STLink', 'openocd, STLINK-v3',
          'openocd, EDBG CMSIS-DAP', 'jlink', 'stm32cubeprogrammer']

scripts/tests/twister/test_runner.py

@@ -557,19 +557,6 @@ def mock_popen(*args, **kwargs):
         [],
         {os.path.join('other', 'zephyr', 'dummy.testsuite.name'): False}
     ),
-    (
-        'other', ['other'], True,
-        False, None, True,
-        'Dummy parse results', True,
-        None,
-        None,
-        {},
-        {},
-        {},
-        None,
-        ['Sysbuild test will be skipped. West must be used for flashing.'],
-        {os.path.join('other', 'zephyr', 'dummy.testsuite.name'): True}
-    ),
     (
         'other', ['other'], False,
         True, None, False,
@@ -652,8 +639,7 @@ def mock_popen(*args, **kwargs):
     ' expected_edt,' \
     ' expected_logs, expected_return',
     TESTDATA_3,
-    ids=['unit testing', 'domain', 'kconfig', 'no cache',
-         'no west options', 'no edt',
+    ids=['unit testing', 'domain', 'kconfig', 'no cache', 'no edt',
          'parse result', 'no parse result', 'no testsuite filter', 'parse err']
 )
 def test_filterbuilder_parse_generated(