From 7e7bbb8df68240e8e5f74c7df7e6de40b1eaa0bd Mon Sep 17 00:00:00 2001 From: Michael du Breuil Date: Tue, 3 Jul 2018 13:04:44 -0700 Subject: [PATCH] Tools: sim_vehicle.py fixups limit pkill to 15 characters, fix GDB arguments for python3 --- Tools/autotest/sim_vehicle.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/autotest/sim_vehicle.py b/Tools/autotest/sim_vehicle.py index f2e4a5cd93..8d5c0b7edb 100755 --- a/Tools/autotest/sim_vehicle.py +++ b/Tools/autotest/sim_vehicle.py @@ -204,7 +204,7 @@ def kill_tasks_psutil(victims): def kill_tasks_pkill(victims): """Shell out to pkill(1) to kill processed by name""" for victim in victims: # pkill takes a single pattern, so iterate - cmd = ["pkill", victim] + cmd = ["pkill", victim[:15]] # pkill matches only first 15 characters run_cmd_blocking("pkill", cmd, quiet=True) @@ -538,7 +538,7 @@ def start_vehicle(binary, autotest, opts, stuff, loc): if opts.gdb or opts.gdb_stopped: cmd_name += " (gdb)" cmd.append("gdb") - gdb_commands_file = tempfile.NamedTemporaryFile(delete=False) + gdb_commands_file = tempfile.NamedTemporaryFile(mode='w', delete=False) atexit.register(os.unlink, gdb_commands_file.name) for breakpoint in opts.breakpoint: