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

Unified Diff: tools/mb/mb.py

Issue 2840953002: Make tab_capture_end2end_tests work as a regular windowed_test_launcher. (Closed)
Patch Set: rebase Created 3 years, 8 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 | « testing/xvfb.py ('k') | no next file » | 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 1aea7a38416b442db9753cb495d00a2559470349..11a30f390e88faae97a24277c186e36850b7ceae 100755
--- a/tools/mb/mb.py
+++ b/tools/mb/mb.py
@@ -853,11 +853,6 @@ class MetaBuildWrapper(object):
runtime_deps_targets = [
target + '.runtime_deps',
'obj/%s.stamp.runtime_deps' % label.replace(':', '/')]
- elif isolate_map[target]['type'] == 'gpu_browser_test':
- if self.platform == 'win32':
- runtime_deps_targets = ['browser_tests.exe.runtime_deps']
- else:
- runtime_deps_targets = ['browser_tests.runtime_deps']
elif (isolate_map[target]['type'] == 'script' or
isolate_map[target].get('label_type') == 'group'):
# For script targets, the build target is usually a group,
@@ -1072,8 +1067,7 @@ class MetaBuildWrapper(object):
# and both can run under Xvfb.
# TODO(tonikitoo,msisov,fwang): Find a way to run tests for the Wayland
# backend.
- use_xvfb = (self.platform == 'linux2' and
- not android)
+ use_xvfb = self.platform == 'linux2' and not android
asan = 'is_asan=true' in vals['gn_args']
msan = 'is_msan=true' in vals['gn_args']
@@ -1125,19 +1119,6 @@ class MetaBuildWrapper(object):
'--msan=%d' % msan,
'--tsan=%d' % tsan,
]
- elif test_type == 'gpu_browser_test':
- extra_files = [
- '../../testing/test_env.py'
- ]
- gtest_filter = isolate_map[target]['gtest_filter']
- cmdline = [
- '../../testing/test_env.py',
- './browser_tests' + executable_suffix,
- '--test-launcher-bot-mode',
- '--enable-gpu',
- '--test-launcher-jobs=1',
- '--gtest_filter=%s' % gtest_filter,
- ]
elif test_type == 'script':
extra_files = [
'../../testing/test_env.py'
« no previous file with comments | « testing/xvfb.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698