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])) |