Upstream change to also kill fletch as part of task_kill.py.

tools/task_kill.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 #
 
 # A script to kill hanging processs. The tool will return non-zero if any
 # process was actually found.
 #
@@ skipping 12 matching lines @@
 POSIX_INFO = 'ps -p %s -o args'
 
 EXECUTABLE_NAMES = {
   'win32': {
     'chrome': 'chrome.exe',
     'content_shell': 'content_shell.exe',
     'dart': 'dart.exe',
     'iexplore': 'iexplore.exe',
     'firefox': 'firefox.exe',
     'git': 'git.exe',
-    'svn': 'svn.exe'
+    'svn': 'svn.exe',
+    'fletch': 'fletch.exe',
+    'fletch-vm': 'fletch-vm.exe',
   },
   'linux': {
     'chrome': 'chrome',
     'content_shell': 'content_shell',
     'dart': 'dart',
     'firefox': 'firefox.exe',
     'git': 'git',
-    'svn': 'svn'
+    'svn': 'svn',
+    'fletch': 'fletch',
+    'fletch-vm': 'fletch-vm',
   },
   'macos': {
     'chrome': 'Chrome',
     'content_shell': 'Content Shell',
     'dart': 'dart',
     'firefox': 'firefox',
     'safari': 'Safari',
     'git': 'git',
-    'svn': 'svn'
+    'svn': 'svn',
+    'fletch': 'fletch',
+    'fletch-vm': 'fletch-vm',
   }
 }
 
 INFO_COMMAND = {
   'win32': 'wmic process where Processid=%s get CommandLine',
   'macos': POSIX_INFO,
   'linux': POSIX_INFO,
 }
 
 def GetOptions():
   parser = optparse.OptionParser("usage: %prog [options]")
   parser.add_option("--kill_dart", default=True,
                     help="Kill all dart processes")
+  parser.add_option("--kill_fletch", default=True,
+                    help="Kill all fletch and fletch-vm processes")
   parser.add_option("--kill_vc", default=True,
                     help="Kill all git and svn processes")
   parser.add_option("--kill_browsers", default=False,
                      help="Kill all browser processes")
   (options, args) = parser.parse_args()
   return options
 
 
 def GetPidsPosix(process_name):
   # This is to have only one posix command, on linux we could just do:
@@ skipping 108 matching lines @@
 
 def KillVCSystems():
   status = Kill('git')
   status += Kill('svn')
   return status
 
 def KillDart():
   status = Kill("dart")
   return status
 
+def KillFletch():
+  status = Kill("fletch")
+  status += Kill("fletch-vm")
+  return status
+
 def Main():
   options = GetOptions()
   status = 0
   if options.kill_dart:
     status += KillDart()
+  if options.kill_fletch:
+    status += KillFletch()
   if options.kill_vc:
     status += KillVCSystems()
   if options.kill_browsers:
     status += KillBrowsers()
   return status
 
 if __name__ == '__main__':
   sys.exit(Main())