Bug 1334900 - drop reftest process kill code for Windows 2000. r=jmaher
authorSebastian Hengst <archaeopteryx@coole-files.de>
Mon, 30 Jan 2017 21:00:36 +0100
changeset 331718 e1f25d46bc107ad9653ad07afd9d866b54677e4f
parent 331717 72188279b3a9cac713fa70538eaa84fb7f15a2d4
child 331719 64f855d835139f6e40ed92ad1d4d4ae47f8ae3b6
push id31281
push userkwierso@gmail.com
push dateMon, 30 Jan 2017 23:45:09 +0000
treeherdermozilla-central@1fe66bd0efba [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1334900
milestone54.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1334900 - drop reftest process kill code for Windows 2000. r=jmaher MozReview-Commit-ID: JRdbFSv0uJp
build/automation.py.in
--- 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)