diff options
| author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-28 05:38:20 +0000 |
|---|---|---|
| committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-28 05:38:20 +0000 |
| commit | 0cf7628b3df79acccbeb724ad99f6ce2899c9d45 (patch) | |
| tree | 0b5ffd6ee23a4082b1aeac1ec23a0697243d4ae7 /tools | |
| parent | b22b27a2ba0df13259fababf32137e7809029111 (diff) | |
| download | chromium_src-0cf7628b3df79acccbeb724ad99f6ce2899c9d45.zip chromium_src-0cf7628b3df79acccbeb724ad99f6ce2899c9d45.tar.gz chromium_src-0cf7628b3df79acccbeb724ad99f6ce2899c9d45.tar.bz2 | |
[Telemetry] Fix reference builds after r209080.
BUG=255056
TEST=xvfb-run tools/perf/run_multipage_benchmarks --browser=exact --browser-executable=chrome/tools/test/reference_build/chrome_linux/chrome page_cycler tools/perf/page_sets/intl_ar_fa_he.json -v
TBR=nduca@chromium.org
NOTRY=True
Review URL: https://chromiumcodereview.appspot.com/18051009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209108 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/telemetry/telemetry/core/chrome/desktop_browser_finder.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/tools/telemetry/telemetry/core/chrome/desktop_browser_finder.py b/tools/telemetry/telemetry/core/chrome/desktop_browser_finder.py index 9560326..848147e 100644 --- a/tools/telemetry/telemetry/core/chrome/desktop_browser_finder.py +++ b/tools/telemetry/telemetry/core/chrome/desktop_browser_finder.py @@ -98,16 +98,6 @@ def FindAllAvailableBrowsers(options): os.getenv('DISPLAY') == None): has_display = False - # Add the explicit browser executable if given. - if options.browser_executable: - normalized_executable = os.path.expanduser(options.browser_executable) - if os.path.exists(normalized_executable): - browsers.append(PossibleDesktopBrowser('exact', options, - normalized_executable, False)) - else: - logging.warning('%s specified by browser_executable does not exist', - normalized_executable) - # Look for a browser in the standard chrome build locations. if options.chrome_root: chrome_root = options.chrome_root @@ -132,6 +122,17 @@ def FindAllAvailableBrowsers(options): else: raise Exception('Platform not recognized') + # Add the explicit browser executable if given. + if options.browser_executable: + normalized_executable = os.path.expanduser(options.browser_executable) + if os.path.exists(normalized_executable): + browsers.append(PossibleDesktopBrowser('exact', options, + normalized_executable, flash_path, + False)) + else: + logging.warning('%s specified by browser_executable does not exist', + normalized_executable) + build_dirs = ['build', 'out', 'sconsbuild', |