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

Side by Side Diff: chrome/browser_tests.isolate

Issue 843713002: Revert "Use Xvfb in isolated testing only if use_x11 is set" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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') | chrome/interactive_ui_tests.isolate » ('j') | 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 ['use_x11==0', { 6 ['OS=="linux"', {
7 'variables': {
8 'command': [
9 '../testing/test_env.py',
10 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
11 '--test-launcher-bot-mode',
12 '--asan=<(asan)',
13 '--lsan=<(lsan)',
14 ],
15 },
16 }],
17 ['use_x11==1', {
18 'variables': { 7 'variables': {
19 'command': [ 8 'command': [
20 '../testing/xvfb.py', 9 '../testing/xvfb.py',
21 '<(PRODUCT_DIR)', 10 '<(PRODUCT_DIR)',
22 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', 11 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
23 '--test-launcher-bot-mode', 12 '--test-launcher-bot-mode',
24 '--asan=<(asan)', 13 '--asan=<(asan)',
25 '--lsan=<(lsan)', 14 '--lsan=<(lsan)',
26 ], 15 ],
27 'files': [ 16 'files': [
28 '../testing/xvfb.py', 17 '../testing/xvfb.py',
29 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
30 ],
31 },
32 }],
33 ['OS=="linux"', {
34 'variables': {
35 'files': [
36 '<(PRODUCT_DIR)/libclearkeycdm.so', 18 '<(PRODUCT_DIR)/libclearkeycdm.so',
37 '<(PRODUCT_DIR)/libclearkeycdmadapter.so', 19 '<(PRODUCT_DIR)/libclearkeycdmadapter.so',
38 '<(PRODUCT_DIR)/libppapi_tests.so', 20 '<(PRODUCT_DIR)/libppapi_tests.so',
39 ], 21 ],
40 }, 22 },
41 }], 23 }],
24 ['OS=="linux" and use_ozone==0', {
25 'variables': {
26 'files': [
27 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
28 ],
29 },
30 }],
42 ['OS=="linux" and libpeer_target_type=="loadable_module"', { 31 ['OS=="linux" and libpeer_target_type=="loadable_module"', {
43 'variables': { 32 'variables': {
44 'files': [ 33 'files': [
45 '<(PRODUCT_DIR)/lib/libpeerconnection.so', 34 '<(PRODUCT_DIR)/lib/libpeerconnection.so',
46 ], 35 ],
47 }, 36 },
48 }], 37 }],
49 ['OS=="linux" or OS=="mac" or OS=="win"', { 38 ['OS=="linux" or OS=="mac" or OS=="win"', {
50 'variables': { 39 'variables': {
51 'files': [ 40 'files': [
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 '<(PRODUCT_DIR)/clearkeycdmadapter.plugin', 151 '<(PRODUCT_DIR)/clearkeycdmadapter.plugin',
163 '<(PRODUCT_DIR)/content_shell.pak', 152 '<(PRODUCT_DIR)/content_shell.pak',
164 '<(PRODUCT_DIR)/libclearkeycdm.dylib', 153 '<(PRODUCT_DIR)/libclearkeycdm.dylib',
165 '<(PRODUCT_DIR)/osmesa.so', 154 '<(PRODUCT_DIR)/osmesa.so',
166 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/', 155 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/',
167 '<(PRODUCT_DIR)/plugins/test_netscape_plugin.plugin/', 156 '<(PRODUCT_DIR)/plugins/test_netscape_plugin.plugin/',
168 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests', 157 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests',
169 ], 158 ],
170 }, 159 },
171 }], 160 }],
161 ['OS=="mac" or OS=="win"', {
162 'variables': {
163 'command': [
164 '../testing/test_env.py',
165 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
166 '--test-launcher-bot-mode',
167 '--asan=<(asan)',
168 '--lsan=<(lsan)',
169 ],
170 },
171 }],
172 ['OS=="win"', { 172 ['OS=="win"', {
173 'variables': { 173 'variables': {
174 'files': [ 174 'files': [
175 '../native_client/build/build_nexe.py', 175 '../native_client/build/build_nexe.py',
176 '<(PRODUCT_DIR)/chrome_elf.dll', 176 '<(PRODUCT_DIR)/chrome_elf.dll',
177 '<(PRODUCT_DIR)/clearkeycdm.dll', 177 '<(PRODUCT_DIR)/clearkeycdm.dll',
178 '<(PRODUCT_DIR)/clearkeycdmadapter.dll', 178 '<(PRODUCT_DIR)/clearkeycdmadapter.dll',
179 '<(PRODUCT_DIR)/plugins/', 179 '<(PRODUCT_DIR)/plugins/',
180 '<(PRODUCT_DIR)/ppapi_tests.dll', 180 '<(PRODUCT_DIR)/ppapi_tests.dll',
181 'tools/build/repack_locales.py', 181 'tools/build/repack_locales.py',
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 'browser/chromeos/login/test/https_forwarder.py', 224 'browser/chromeos/login/test/https_forwarder.py',
225 ], 225 ],
226 }, 226 },
227 }], 227 }],
228 ], 228 ],
229 'includes': [ 229 'includes': [
230 '../base/base.isolate', 230 '../base/base.isolate',
231 'chrome.isolate', 231 'chrome.isolate',
232 ], 232 ],
233 } 233 }
OLDNEW
« no previous file with comments | « build/isolate.gypi ('k') | chrome/interactive_ui_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698