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

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

Issue 901143006: Add support in Telemetry for other Ozone based targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix nits Created 5 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py
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 e2fba9e724673fd5125d233ffec58e4d0b050ae1..13018f9c2ef079b483397b6e76dd3658fa582deb 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py
@@ -124,10 +124,10 @@ def FindAllAvailableBrowsers(finder_options, device):
if not CanFindAvailableBrowsers():
return []
- has_display = True
+ has_x11_display = True
if (sys.platform.startswith('linux') and
os.getenv('DISPLAY') == None):
- has_display = False
+ has_x11_display = False
# Look for a browser in the standard chrome build locations.
if finder_options.chrome_root:
@@ -259,7 +259,12 @@ def FindAllAvailableBrowsers(finder_options, device):
browser_name, finder_options, app_path,
None, False, os.path.dirname(app_path)))
- if len(browsers) and not has_display:
+ has_ozone_platform = False
+ for arg in finder_options.browser_options.extra_browser_args:
+ if "--ozone-platform" in arg:
+ has_ozone_platform = True
+
+ if len(browsers) and not has_x11_display and not has_ozone_platform:
logging.warning(
'Found (%s), but you do not have a DISPLAY environment set.' %
','.join([b.browser_type for b in browsers]))
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698