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

Side by Side Diff: ui/touch_selection/ui_touch_selection_unittests.isolate

Issue 813363003: 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
OLDNEW
1 # Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2014 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" or OS=="mac" or OS=="win"', { 6 ['OS=="linux" or OS=="mac" or OS=="win"', {
7 'variables': { 7 'variables': {
8 'files': [ 8 'files': [
9 '../../testing/test_env.py', 9 '../../testing/test_env.py',
10 '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)',
11 ], 11 ],
12 }, 12 },
13 }], 13 }],
14 ['OS=="linux"', { 14 ['OS=="linux" and use_x11==1', {
15 'variables': { 15 'variables': {
16 'command': [ 16 'command': [
17 '../../testing/xvfb.py', 17 '../../testing/xvfb.py',
18 '<(PRODUCT_DIR)', 18 '<(PRODUCT_DIR)',
19 '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)', 19 '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)',
20 '--brave-new-test-launcher', 20 '--brave-new-test-launcher',
21 '--test-launcher-bot-mode', 21 '--test-launcher-bot-mode',
22 '--asan=<(asan)', 22 '--asan=<(asan)',
23 '--lsan=<(lsan)', 23 '--lsan=<(lsan)',
24 ], 24 ],
25 'files': [ 25 'files': [
26 '../../testing/xvfb.py', 26 '../../testing/xvfb.py',
27 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
28 ],
29 },
30 }],
31 ['OS=="linux"', {
32 'variables': {
33 'files': [
27 '<(PRODUCT_DIR)/libosmesa.so', 34 '<(PRODUCT_DIR)/libosmesa.so',
28 ], 35 ],
29 }, 36 },
30 }], 37 }],
31 ['OS=="linux" and use_ozone==0', {
32 'variables': {
33 'files': [
34 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
35 ],
36 },
37 }],
38 ['OS=="mac"', { 38 ['OS=="mac"', {
39 'variables': { 39 'variables': {
40 'files': [ 40 'files': [
41 '<(PRODUCT_DIR)/osmesa.so', 41 '<(PRODUCT_DIR)/osmesa.so',
42 ], 42 ],
43 }, 43 },
44 }], 44 }],
45 ['OS=="win"', { 45 ['OS=="win"', {
46 'variables': { 46 'variables': {
47 'files': [ 47 'files': [
48 '<(PRODUCT_DIR)/osmesa.dll', 48 '<(PRODUCT_DIR)/osmesa.dll',
49 ], 49 ],
50 }, 50 },
51 }], 51 }],
52 ['OS=="mac" or OS=="win"', { 52 ['OS=="mac" or OS=="win" or use_ozone==1', {
53 'variables': { 53 'variables': {
54 'command': [ 54 'command': [
55 '../../testing/test_env.py', 55 '../../testing/test_env.py',
56 '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)', 56 '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)',
57 '--brave-new-test-launcher', 57 '--brave-new-test-launcher',
58 '--test-launcher-bot-mode', 58 '--test-launcher-bot-mode',
59 '--asan=<(asan)', 59 '--asan=<(asan)',
60 '--lsan=<(lsan)', 60 '--lsan=<(lsan)',
61 ], 61 ],
62 }, 62 },
63 }], 63 }],
64 ], 64 ],
65 'includes': [ 65 'includes': [
66 '../../base/base.isolate', 66 '../../base/base.isolate',
67 ], 67 ],
68 } 68 }
OLDNEW
« ash/ash_unittests.isolate ('K') | « ui/message_center/message_center_unittests.isolate ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698