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

Side by Side Diff: chrome/browser_tests.isolate

Issue 936303002: Make Xvfb for browser_tests dependent on use_x11 instead of OS=="linux" Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: even smaller patch 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 unified diff | Download patch
« no previous file with comments | « build/isolate.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'conditions': [ 5 'conditions': [
6 ['OS=="linux"', { 6 ['use_x11==1', {
7 'variables': { 7 'variables': {
8 'command': [ 8 'command': [
9 '../testing/xvfb.py', 9 '../testing/xvfb.py',
10 '<(PRODUCT_DIR)', 10 '<(PRODUCT_DIR)',
11 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', 11 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
12 '--test-launcher-bot-mode', 12 '--test-launcher-bot-mode',
13 '--asan=<(asan)', 13 '--asan=<(asan)',
14 '--lsan=<(lsan)', 14 '--lsan=<(lsan)',
15 '--msan=<(msan)', 15 '--msan=<(msan)',
16 '--tsan=<(tsan)', 16 '--tsan=<(tsan)',
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 'browser/chromeos/login/test/https_forwarder.py', 237 'browser/chromeos/login/test/https_forwarder.py',
238 ], 238 ],
239 }, 239 },
240 }], 240 }],
241 ], 241 ],
242 'includes': [ 242 'includes': [
243 '../base/base.isolate', 243 '../base/base.isolate',
244 'chrome.isolate', 244 'chrome.isolate',
245 ], 245 ],
246 } 246 }
OLDNEW
« no previous file with comments | « build/isolate.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698