Index: chrome/test/chromedriver/run_buildbot_steps.py |
diff --git a/chrome/test/chromedriver/run_buildbot_steps.py b/chrome/test/chromedriver/run_buildbot_steps.py |
index 87f560036e795eaf47dff7abf60ed2bfd573b886..51e1a1d338470bf00cbf8917d1b4b09a48103fe3 100755 |
--- a/chrome/test/chromedriver/run_buildbot_steps.py |
+++ b/chrome/test/chromedriver/run_buildbot_steps.py |
@@ -8,6 +8,7 @@ |
import optparse |
import os |
import subprocess |
+import shutil |
import sys |
import urllib2 |
import zipfile |
@@ -130,7 +131,36 @@ def MaybeRelease(revision): |
print '@@@STEP_FAILURE@@@' |
+def KillChromes(chrome_path): |
+ chrome_map = { |
+ 'win': 'chrome.exe', |
+ 'mac': 'Chromium', |
+ 'linux': 'chrome', |
+ } |
+ if util.IsWindows(): |
+ cmd = ['taskkill', '/F', '/IM'] |
+ else: |
+ cmd = ['pkill', '-9'] |
+ cmd.Append(chrome_map[util.GetPlatformName()]) |
+ util.RunCommand(cmd) |
+ |
+ |
+def CleanTmpDir(): |
+ tmp_dir = os.path.dirname(util.MakeTempDir()) |
kkania
2013/04/29 22:54:30
tempfile.gettempdir()
chrisgao (Use stgao instead)
2013/04/30 00:55:29
Done.
|
+ print 'cleaning temp directory:', tmp_dir |
+ for file_name in os.listdir(tmp_dir): |
+ if not os.path.isdir(os.path.join(tmp_dir, file_name)): |
+ continue |
+ if file_name.startswith('jetty-0.0.0.0-') or file_name.startswith('tmp'): |
+ print 'deleting sub-directory', file_name |
+ shutil.rmtree(os.path.join(tmp_dir, file_name), True) |
+ |
+ |
def main(): |
+ CleanTmpDir() |
+ if not options.android_package: |
+ KillChromes() |
+ |
parser = optparse.OptionParser() |
parser.add_option( |
'', '--android-package', |