twister: espressif: fix board_id set as port argument

fix a bug for the twister handler script generating the esptool flash
command. The 'device_id' was used to complete the esptool 'port'
argument, but esptool is expecting for the serial at this place.
This commit is adding a special case for the esp32 to fetch and add the
serial port as an argument for the flash tool.

FIXES #93601

Signed-off-by: jerome Lamy <jerome.lamy@savoirfairelinux.com>

Author: jeromelamysfl

scripts/pylib/pytest-twister-harness/src/twister_harness/device/hardware_adapter.py

@@ -73,9 +73,6 @@ def _prepare_runner_args(self) -> tuple[list[str], list[str]]:
             if runner == 'pyocd':
                 extra_args.append('--board-id')
                 extra_args.append(board_id)
-            elif runner == "esp32":
-                extra_args.append("--esp-device")
-                extra_args.append(board_id)
             elif runner in ('nrfjprog', 'nrfutil'):
                 extra_args.append('--dev-id')
                 extra_args.append(board_id)
@@ -95,6 +92,9 @@ def _prepare_runner_args(self) -> tuple[list[str], list[str]]:
                 base_args.append(f'--tool-opt=sn={board_id}')
             elif runner == 'linkserver':
                 base_args.append(f'--probe={board_id}')
+        if (serial_pty := self.device_config.serial_pty) and runner == 'esp32':
+            extra_args.append("--esp-device")
+            extra_args.append(serial_pty)
         return base_args, extra_args
 
     def _flash_and_run(self) -> None:

scripts/pylib/twister/twisterlib/handlers.py

@@ -569,9 +569,6 @@ def _create_command(self, runner, hardware):
                     if runner in ("pyocd", "nrfjprog", "nrfutil"):
                         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"
@@ -596,7 +593,16 @@ def _create_command(self, runner, hardware):
                         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)
 
+                serial_port = hardware.serial
+                if serial_port is not None:
+                    if runner == "esp32":
+                        command_extra_args.append("--esp-device")
+                        command_extra_args.append(serial_port)
                     # Receive parameters from runner_params field.
                     if hardware.runner_params:
                         for param in hardware.runner_params: