scripts: pytest: hw_adapter: use --dev-id for STM32CubeProgrammer runner

Now that the STM32CubeProgrammer runner supports the standard `--dev-id`
argument, replace usage of `--tool-opt` in the pytest harness hardware
adapter.

Signed-off-by: Mathieu Choplain <[email protected]>

Author: mathieuchopstm

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

@@ -103,11 +103,9 @@ def _prepare_runner_args(self) -> tuple[list[str], list[str]]:
             elif runner == "openocd" and self.device_config.product == "LPC-LINK2 CMSIS-DAP":
                 extra_args.append("--cmd-pre-init")
                 extra_args.append(f'adapter serial {board_id}')
-            elif runner == 'jlink':
+            elif runner == 'jlink' or (runner == 'stm32cubeprogrammer' and self.device_config.product != "BOOT-SERIAL"):
                 base_args.append('--dev-id')
                 base_args.append(board_id)
-            elif runner == 'stm32cubeprogrammer' and self.device_config.product != "BOOT-SERIAL":
-                base_args.append(f'--tool-opt=sn={board_id}')
             elif runner == 'linkserver':
                 base_args.append(f'--probe={board_id}')
         return base_args, extra_args

scripts/pylib/pytest-twister-harness/tests/device/hardware_adapter_test.py

@@ -112,7 +112,7 @@ def test_if_get_command_returns_proper_string_7(patched_which, device: HardwareA
     assert isinstance(device.command, list)
     assert device.command == [
         'west', 'flash', '--skip-rebuild', '--build-dir', 'build', '--runner', 'stm32cubeprogrammer',
-        '--tool-opt=sn=p_id'
+        '--dev-id', 'p_id'
     ]