OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 import logging | 5 import logging |
6 import optparse | 6 import optparse |
7 import os | 7 import os |
8 import shutil | 8 import shutil |
9 import sys | 9 import sys |
10 import zipfile | 10 import zipfile |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 | 223 |
224 # If profile dir specified on command line, nothing to do. | 224 # If profile dir specified on command line, nothing to do. |
225 if options.browser_options.profile_dir: | 225 if options.browser_options.profile_dir: |
226 logging.warning("Profile directory specified on command line: %s, this" | 226 logging.warning("Profile directory specified on command line: %s, this" |
227 "overrides the benchmark's default profile directory.", | 227 "overrides the benchmark's default profile directory.", |
228 options.browser_options.profile_dir) | 228 options.browser_options.profile_dir) |
229 return | 229 return |
230 | 230 |
231 # Download profile directory from cloud storage. | 231 # Download profile directory from cloud storage. |
232 found_browser = browser_finder.FindBrowser(options) | 232 found_browser = browser_finder.FindBrowser(options) |
| 233 if found_browser.IsRemote(): |
| 234 return |
233 test_data_dir = os.path.join(util.GetChromiumSrcDir(), 'tools', 'perf', | 235 test_data_dir = os.path.join(util.GetChromiumSrcDir(), 'tools', 'perf', |
234 'generated_profiles', | 236 'generated_profiles', |
235 found_browser.target_os) | 237 found_browser.target_os) |
236 generated_profile_archive_path = os.path.normpath( | 238 generated_profile_archive_path = os.path.normpath( |
237 os.path.join(test_data_dir, archive_name)) | 239 os.path.join(test_data_dir, archive_name)) |
238 | 240 |
239 try: | 241 try: |
240 cloud_storage.GetIfChanged(generated_profile_archive_path, | 242 cloud_storage.GetIfChanged(generated_profile_archive_path, |
241 cloud_storage.PUBLIC_BUCKET) | 243 cloud_storage.PUBLIC_BUCKET) |
242 except (cloud_storage.CredentialsError, | 244 except (cloud_storage.CredentialsError, |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 """ | 339 """ |
338 return test_expectations.TestExpectations() | 340 return test_expectations.TestExpectations() |
339 | 341 |
340 | 342 |
341 def AddCommandLineArgs(parser): | 343 def AddCommandLineArgs(parser): |
342 user_story_runner.AddCommandLineArgs(parser) | 344 user_story_runner.AddCommandLineArgs(parser) |
343 | 345 |
344 | 346 |
345 def ProcessCommandLineArgs(parser, args): | 347 def ProcessCommandLineArgs(parser, args): |
346 user_story_runner.ProcessCommandLineArgs(parser, args) | 348 user_story_runner.ProcessCommandLineArgs(parser, args) |
OLD | NEW |