OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
5 | 5 |
6 """Runs all the buildbot steps for ChromeDriver except for update/compile.""" | 6 """Runs all the buildbot steps for ChromeDriver except for update/compile.""" |
7 | 7 |
8 import optparse | 8 import optparse |
9 import os | 9 import os |
10 import platform | 10 import platform |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 break | 171 break |
172 util.PrintAndFlush('Waiting for snapshot >= %s, found %s' % | 172 util.PrintAndFlush('Waiting for snapshot >= %s, found %s' % |
173 (revision, snapshot_revision)) | 173 (revision, snapshot_revision)) |
174 time.sleep(60) | 174 time.sleep(60) |
175 util.PrintAndFlush('Got snapshot revision %s' % snapshot_revision) | 175 util.PrintAndFlush('Got snapshot revision %s' % snapshot_revision) |
176 | 176 |
177 | 177 |
178 def main(): | 178 def main(): |
179 parser = optparse.OptionParser() | 179 parser = optparse.OptionParser() |
180 parser.add_option( | 180 parser.add_option( |
181 '', '--android-package', | 181 '', '--android-packages', |
182 help='Application package name, if running tests on Android.') | 182 help='Comma separated list of application package names, ' |
| 183 'if running tests on Android.') |
183 parser.add_option( | 184 parser.add_option( |
184 '-r', '--revision', type='string', default=None, | 185 '-r', '--revision', type='string', default=None, |
185 help='Chromium revision') | 186 help='Chromium revision') |
186 options, _ = parser.parse_args() | 187 options, _ = parser.parse_args() |
187 | 188 |
188 if not options.android_package: | 189 if not options.android_packages: |
189 KillChromes() | 190 KillChromes() |
190 CleanTmpDir() | 191 CleanTmpDir() |
191 | 192 |
192 if options.android_package: | 193 if options.android_packages: |
193 Download() | 194 Download() |
194 else: | 195 else: |
195 if not options.revision: | 196 if not options.revision: |
196 parser.error('Must supply a --revision') | 197 parser.error('Must supply a --revision') |
197 | 198 |
198 if util.IsLinux() and platform.architecture()[0] == '64bit': | 199 if util.IsLinux() and platform.architecture()[0] == '64bit': |
199 Archive(options.revision) | 200 Archive(options.revision) |
200 | 201 |
201 WaitForLatestSnapshot(options.revision) | 202 WaitForLatestSnapshot(options.revision) |
202 | 203 |
203 cmd = [ | 204 cmd = [ |
204 sys.executable, | 205 sys.executable, |
205 os.path.join(_THIS_DIR, 'test', 'run_all_tests.py'), | 206 os.path.join(_THIS_DIR, 'test', 'run_all_tests.py'), |
206 ] | 207 ] |
207 if options.android_package: | 208 if options.android_packages: |
208 cmd.append('--android-package=' + options.android_package) | 209 cmd.append('--android-packages=' + options.android_packages) |
209 | 210 |
210 passed = (util.RunCommand(cmd) == 0) | 211 passed = (util.RunCommand(cmd) == 0) |
211 | 212 |
212 if not options.android_package and passed: | 213 if not options.android_packages and passed: |
213 MaybeRelease(options.revision) | 214 MaybeRelease(options.revision) |
214 | 215 |
215 | 216 |
216 if __name__ == '__main__': | 217 if __name__ == '__main__': |
217 main() | 218 main() |
OLD | NEW |