Add git and svn to task_kill which we run on the bots.

We are occasionally seeing orphaned git processes when running pub tests on windows.

R=kustermann@google.com

Review URL: https://codereview.chromium.org//259963007

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@35475 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
ricow@google.com 2014-04-28 07:32:45 +00:00
parent 8e34dc3546
commit 1aba267aa7

View file

@ -28,20 +28,26 @@ EXECUTABLE_NAMES = {
'content_shell': 'content_shell.exe', 'content_shell': 'content_shell.exe',
'dart': 'dart.exe', 'dart': 'dart.exe',
'iexplore': 'iexplore.exe', 'iexplore': 'iexplore.exe',
'firefox': 'firefox.exe' 'firefox': 'firefox.exe',
'git': 'git.exe',
'svn': 'svn.exe'
}, },
'linux': { 'linux': {
'chrome': 'chrome', 'chrome': 'chrome',
'content_shell': 'content_shell', 'content_shell': 'content_shell',
'dart': 'dart', 'dart': 'dart',
'firefox': 'firefox.exe' 'firefox': 'firefox.exe',
'git': 'git',
'svn': 'svn'
}, },
'macos': { 'macos': {
'chrome': 'Chrome', 'chrome': 'Chrome',
'content_shell': 'Content Shell', 'content_shell': 'Content Shell',
'dart': 'dart', 'dart': 'dart',
'firefox': 'firefox', 'firefox': 'firefox',
'safari': 'Safari' 'safari': 'Safari',
'git': 'git',
'svn': 'svn'
} }
} }
@ -55,6 +61,8 @@ def GetOptions():
parser = optparse.OptionParser("usage: %prog [options]") parser = optparse.OptionParser("usage: %prog [options]")
parser.add_option("--kill_dart", default=True, parser.add_option("--kill_dart", default=True,
help="Kill all dart processes") help="Kill all dart processes")
parser.add_option("--kill_vc", default=True,
help="Kill all git and svn processes")
parser.add_option("--kill_browsers", default=False, parser.add_option("--kill_browsers", default=False,
help="Kill all browser processes") help="Kill all browser processes")
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
@ -170,6 +178,11 @@ def KillBrowsers():
status += Kill('content_shell') status += Kill('content_shell')
return status return status
def KillVCSystems():
status = Kill('git')
status += Kill('svn')
return status
def KillDart(): def KillDart():
status = Kill("dart") status = Kill("dart")
return status return status
@ -179,6 +192,8 @@ def Main():
status = 0 status = 0
if (options.kill_dart): if (options.kill_dart):
status += KillDart(); status += KillDart();
if (options.kill_vc):
status += KillVCSystems();
if (options.kill_browsers): if (options.kill_browsers):
status += KillBrowsers() status += KillBrowsers()
return status return status