Bug 1334900 - drop reftest process kill code for Windows 2000. r?jmaher
MozReview-Commit-ID: BzN8WRvT0Hg
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -174,26 +174,17 @@ class Automation(object):
shell, cwd, env,
universal_newlines, startupinfo, creationflags)
self.log = _log
def kill(self):
if Automation().IS_WIN32:
import platform
pid = "%i" % self.pid
- if platform.release() == "2000":
- # Windows 2000 needs 'kill.exe' from the
- #'Windows 2000 Resource Kit tools'. (See bug 475455.)
- try:
- subprocess.Popen(["kill", "-f", pid]).wait()
- except:
- self.log.info("TEST-UNEXPECTED-FAIL | automation.py | Missing 'kill' utility to kill process with pid=%s. Kill it manually!", pid)
- else:
- # Windows XP and later.
- subprocess.Popen(["taskkill", "/F", "/PID", pid]).wait()
+ subprocess.Popen(["taskkill", "/F", "/PID", pid]).wait()
else:
os.kill(self.pid, signal.SIGKILL)
def environment(self, env=None, xrePath=None, crashreporter=True, debugger=False, dmdPath=None, lsanPath=None):
if xrePath == None:
xrePath = self.DIST_BIN
if env == None:
env = dict(os.environ)