Bug 1334900 - drop reftest process kill code for Windows 2000. r?jmaher draft
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sun, 29 Jan 2017 17:58:40 +0100
changeset 467780 92474670ad20da5991d737c4d41f897e6e68ede2
parent 467750 e7b795db8b5b20c472d8070030e9b08c99a01db6
child 543775 bec20476576ef4b3235d635a2dd7f936aed42432
push id43272
push userarchaeopteryx@coole-files.de
push dateSun, 29 Jan 2017 16:59:18 +0000
reviewersjmaher
bugs1334900
milestone54.0a1
Bug 1334900 - drop reftest process kill code for Windows 2000. r?jmaher MozReview-Commit-ID: BzN8WRvT0Hg
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)