Merge pull request #120 from jhamrick/master

tkf · tkf · commit 0cc49439a15e · 2013-06-29T09:12:29.000-07:00
Resolve tools/testein.py failure on OS X
diff --git a/tools/testein.py b/tools/testein.py
@@ -376,8 +376,8 @@ def command(self):
 def kill_subprocesses(pid, include=lambda x: True):
     from subprocess import Popen, PIPE
     import signal
-    command = [
-        'ps', '--ppid', str(pid), '--format', 'pid,cmd', '--no-headers']
+
+    command = ['ps', '-e', '-o', 'ppid,pid,command']
     proc = Popen(command, stdout=PIPE, stderr=PIPE)
     (stdout, stderr) = proc.communicate()
     if proc.returncode != 0:
@@ -386,10 +386,10 @@ def kill_subprocesses(pid, include=lambda x: True):
             '{2}'.format(command, proc.returncode, stderr))
 
     for line in map(str.strip, stdout.splitlines()):
-        (pid, cmd) = line.split(' ', 1)
-        if include(cmd):
-            print "Killing PID={0} COMMAND={1}".format(pid, cmd)
-            os.kill(int(pid), signal.SIGINT)
+        (cmd_ppid, cmd_pid, cmd) = line.split(None, 2)
+        if cmd_ppid == str(pid) and include(cmd):
+            print "Killing PID={0} COMMAND={1}".format(cmd_pid, cmd)
+            os.kill(int(cmd_pid), signal.SIGINT)
 
 
 def construct_command(args):
