tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py - Issue 643973002: Add multi-architecture support in telemetry.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py

Issue 643973002: Add multi-architecture support in telemetry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix trybot failure Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « tools/telemetry/telemetry/core/backends/adb_commands.py ('k') | tools/telemetry/telemetry/core/backends/webdriver/webdriver_desktop_browser_finder.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py

diff --git a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py

index 19836151f4b6f17be064e8cddf0448c31462897b..b7d0c62419787c2ac0be5cf20343a7a541de5572 100644

--- a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py

+++ b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py

@@ -99,8 +99,9 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):

os_name = self._browser.platform.GetOSName()

if os_name != 'win':

return None

+ arch_name = self._browser.platform.GetArchName()

return subprocess.Popen([

- support_binaries.FindPath('crash_service', os_name),

+ support_binaries.FindPath('crash_service', arch_name, os_name),

'--no-window',

'--dumps-dir=%s' % self._tmp_minidump_dir,

'--pipe-name=%s' % self._GetCrashServicePipeName()])

@@ -253,7 +254,9 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):

stack_end = output.find('quit:')

return output[stack_start:stack_end]

- stackwalk = support_binaries.FindPath('minidump_stackwalk', os_name)

+ arch_name = self._browser.platform.GetArchName()

+ stackwalk = support_binaries.FindPath(

+ 'minidump_stackwalk', arch_name, os_name)

if not stackwalk:

logging.warning('minidump_stackwalk binary not found.')

return None