scripts: runners: fix blackmagicprobe SIGINT behavior

The blackmagicprobe runner's Python process fails to ignore SIGINT
when it runs GDB from the debug and flash callbacks, which is wrong.

The other runners tend to use run_server_and_client() to properly
handle this, since they start a GDB server and connect to it with a
client. The BMP USB device presents itself as a serial device which
speaks the GDB serial protocol instead, so there's no server/client,
and thus no call to run_server_and_client().

The problem is that blackmagicprobe essentially uses
subprocess.check_call() to start GDB directly, without ignoring SIGINT
in the python process. Easy fix.

Fixes: #21139

Signed-off-by: Martí Bolívar <[email protected]>

Author: mbolivar-nordic

scripts/west_commands/runners/blackmagicprobe.py

@@ -5,8 +5,9 @@
 '''Runner for flashing with Black Magic Probe.'''
 # https://github.com/blacksphere/blackmagic/wiki
 
-from runners.core import ZephyrBinaryRunner, RunnerCaps
+import signal
 
+from runners.core import ZephyrBinaryRunner, RunnerCaps
 
 class BlackMagicProbeRunner(ZephyrBinaryRunner):
     '''Runner front-end for Black Magic probe.'''
@@ -48,6 +49,13 @@ def bmp_flash(self, command, **kwargs):
                     '-silent'])
         self.check_call(command)
 
+    def check_call_ignore_sigint(self, command):
+        previous = signal.signal(signal.SIGINT, signal.SIG_IGN)
+        try:
+            self.check_call(command)
+        finally:
+            signal.signal(signal.SIGINT, previous)
+
     def bmp_attach(self, command, **kwargs):
         if self.elf_file is None:
             command = (self.gdb +
@@ -64,7 +72,7 @@ def bmp_attach(self, command, **kwargs):
                         '-ex', "monitor swdp_scan",
                         '-ex', "attach 1",
                         '-ex', "file {}".format(self.elf_file)])
-        self.check_call(command)
+        self.check_call_ignore_sigint(command)
 
     def bmp_debug(self, command, **kwargs):
         if self.elf_file is None:
@@ -76,7 +84,7 @@ def bmp_debug(self, command, **kwargs):
                     '-ex', "attach 1",
                     '-ex', "file {}".format(self.elf_file),
                     '-ex', "load {}".format(self.elf_file)])
-        self.check_call(command)
+        self.check_call_ignore_sigint(command)
 
     def do_run(self, command, **kwargs):
         if self.gdb is None: