Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

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

Issue 1498633003: Added unit test for stack traces in telemetry crashes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Just enable for mac for now, focus on one platform Created 4 years, 11 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/exceptions.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_backend.py
diff --git a/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_backend.py b/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_backend.py
index 603e769910b1e1e9c481cff88330c6a4017c3449..041de993f34800825391013ba347014e0fc14f96 100644
--- a/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_backend.py
+++ b/tools/telemetry/telemetry/internal/backends/chrome/desktop_browser_backend.py
@@ -34,6 +34,23 @@ def ParseCrashpadDateTime(date_time_str):
return datetime.datetime.strptime(date_time_str, '%Y-%m-%d %H:%M:%S')
+def GetSymbolBinary(executable, os_name):
+ # Returns binary file where symbols are located.
+ if os_name == 'mac':
+ version_dir = os.path.join(os.path.dirname(executable),
+ '..',
+ 'Versions')
+ for version_num in os.listdir(version_dir):
+ framework_file = os.path.join(version_dir,
+ version_num,
+ 'Chromium Framework.framework',
+ 'Chromium Framework')
+ if os.path.isfile(framework_file):
+ return framework_file
+
+ return executable
+
+
class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
"""The backend for controlling a locally-executed browser instance, on Linux,
Mac or Windows.
@@ -453,7 +470,8 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
cmd = [
sys.executable,
generate_breakpad_symbols_command,
- '--binary=%s' % self._executable,
+ '--binary=%s' % GetSymbolBinary(self._executable,
+ self.browser.platform.GetOSName()),
'--symbols-dir=%s' % symbols_path,
'--build-dir=%s' % self._browser_directory,
]
« no previous file with comments | « tools/telemetry/telemetry/core/exceptions.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698