summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortonyg <tonyg@chromium.org>2014-09-23 17:44:50 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-24 00:45:00 +0000
commitf3e00b33be7782d91d1b8dc01e361299a9e656cf (patch)
tree18ef84df7ef47aa36de0258871427c6b4bef4bf8
parentc1e1fe3e72078b75028cf5ea06ffa318e0cfcd49 (diff)
downloadchromium_src-f3e00b33be7782d91d1b8dc01e361299a9e656cf.zip
chromium_src-f3e00b33be7782d91d1b8dc01e361299a9e656cf.tar.gz
chromium_src-f3e00b33be7782d91d1b8dc01e361299a9e656cf.tar.bz2
[Telemetry] Fix running reference build on linux.
The args were messed up. BUG=388885 NOTRY=True Review URL: https://codereview.chromium.org/596983002 Cr-Commit-Position: refs/heads/master@{#296318}
-rw-r--r--tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py
index dcd34cb..468b790 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py
@@ -218,12 +218,12 @@ def FindAllAvailableBrowsers(finder_options):
browsers.append(PossibleDesktopBrowser('system', finder_options,
'google-chrome', None, False,
'/opt/google/chrome'))
- linux_reference = os.path.join(reference_build_root, 'chrome_linux',
- 'chrome')
+ linux_reference_root = os.path.join(reference_build_root, 'chrome_linux')
+ linux_reference = os.path.join(linux_reference_root, 'chrome')
if path.IsExecutable(linux_reference):
browsers.append(PossibleDesktopBrowser('reference', finder_options,
- 'chrome', None, False,
- linux_reference))
+ linux_reference, None, False,
+ linux_reference_root))
# Win32-specific options.
if sys.platform.startswith('win'):