summaryrefslogtreecommitdiff
path: root/Tools/Scripts/webkitpy/common/system/executive.py
diff options
context:
space:
mode:
Diffstat (limited to 'Tools/Scripts/webkitpy/common/system/executive.py')
-rw-r--r--Tools/Scripts/webkitpy/common/system/executive.py15
1 files changed, 6 insertions, 9 deletions
diff --git a/Tools/Scripts/webkitpy/common/system/executive.py b/Tools/Scripts/webkitpy/common/system/executive.py
index 06f870c72..43dcbca1b 100644
--- a/Tools/Scripts/webkitpy/common/system/executive.py
+++ b/Tools/Scripts/webkitpy/common/system/executive.py
@@ -32,7 +32,6 @@ import ctypes
import errno
import logging
import os
-import platform
import StringIO
import signal
import subprocess
@@ -255,16 +254,14 @@ class Executive(object):
def check_running_pid(self, pid):
"""Return True if pid is alive, otherwise return False."""
- if sys.platform.startswith('linux') or sys.platform in ('darwin', 'cygwin'):
- try:
- os.kill(pid, 0)
- return True
- except OSError:
- return False
- elif sys.platform == 'win32':
+ if sys.platform == 'win32':
return self._win32_check_running_pid(pid)
- assert(False)
+ try:
+ os.kill(pid, 0)
+ return True
+ except OSError:
+ return False
def running_pids(self, process_name_filter=None):
if not process_name_filter: