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

Unified Diff: tools/mb/mb.py

Issue 2587473002: Use xvfb with Ozone CrOS. (Closed)
Patch Set: Cleanup. Created 4 years 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 | « testing/buildbot/gn_isolate_map.pyl ('k') | ui/gl/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/mb/mb.py
diff --git a/tools/mb/mb.py b/tools/mb/mb.py
index 59b820ad044823f0ea92bb03581bc3b2336493c8..edbb434d27bfb36a9f3f4d1e8c0ab59231e909a3 100755
--- a/tools/mb/mb.py
+++ b/tools/mb/mb.py
@@ -1060,14 +1060,14 @@ class MetaBuildWrapper(object):
android = 'target_os="android"' in vals['gn_args']
ozone = 'use_ozone=true' in vals['gn_args']
- ozone_x11 = (ozone and 'args' in isolate_map[target] and
- '--ozone-platform=x11' in isolate_map[target]['args'])
+ chromeos = 'target_os="chromeos"' in vals['gn_args']
- # This needs to mirror the settings in //build/config/ui.gni:
- # use_x11 = is_linux && !use_ozone || use_ozone && --ozone-platform=x11
- use_x11 = (self.platform == 'linux2' and
+ # This should be true if tests with type='windowed_test_launcher' are
+ # expected to run using xvfb. For example, Linux Desktop, X11 CrOS and
+ # Ozone CrOS builds.
+ use_xvfb = (self.platform == 'linux2' and
not android and
- (ozone_x11 or not ozone))
+ ((not ozone) or (ozone and chromeos)))
asan = 'is_asan=true' in vals['gn_args']
msan = 'is_msan=true' in vals['gn_args']
@@ -1103,7 +1103,7 @@ class MetaBuildWrapper(object):
]
cmdline = (['./../../build/android/test_wrapper/logdog_wrapper.py']
+ logdog_command + test_cmdline)
- elif use_x11 and test_type == 'windowed_test_launcher':
+ elif use_xvfb and test_type == 'windowed_test_launcher':
extra_files = [
'../../testing/test_env.py',
'../../testing/xvfb.py',
« no previous file with comments | « testing/buildbot/gn_isolate_map.pyl ('k') | ui/gl/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698