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..f9b8edf54a6e34382512527fb4f7117ed0335924 100755 |
--- a/chrome/test/chromedriver/run_buildbot_steps.py |
+++ b/chrome/test/chromedriver/run_buildbot_steps.py |
@@ -8,7 +8,9 @@ |
import optparse |
import os |
import subprocess |
+import shutil |
import sys |
+import tempfile |
import urllib2 |
import zipfile |
@@ -130,6 +132,29 @@ def MaybeRelease(revision): |
print '@@@STEP_FAILURE@@@' |
+def KillChromes(): |
+ 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 = tempfile.gettempdir() |
+ print 'cleaning temp directory:', tmp_dir |
+ for file_name in os.listdir(tmp_dir): |
+ if os.path.isdir(os.path.join(tmp_dir, file_name)): |
+ print 'deleting sub-directory', file_name |
+ shutil.rmtree(os.path.join(tmp_dir, file_name), True) |
+ |
+ |
def main(): |
parser = optparse.OptionParser() |
parser.add_option( |
@@ -140,6 +165,10 @@ def main(): |
help='Chromium revision') |
options, _ = parser.parse_args() |
+ if not options.android_package: |
+ KillChromes() |
+ CleanTmpDir() |
+ |
if options.android_package: |
Download() |
else: |