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

Side by Side Diff: ui/app_list/app_list_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)/app_list_unittests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/app_list_unittests<(EXECUTABLE_SUFFIX)',
11 '<(PRODUCT_DIR)/ui_test.pak', 11 '<(PRODUCT_DIR)/ui_test.pak',
12 ], 12 ],
13 }, 13 },
14 }], 14 }],
15 ['OS=="linux"', { 15 ['OS=="linux" and use_x11==1', {
16 'variables': { 16 'variables': {
17 'command': [ 17 'command': [
18 '../../testing/xvfb.py', 18 '../../testing/xvfb.py',
19 '<(PRODUCT_DIR)', 19 '<(PRODUCT_DIR)',
20 '<(PRODUCT_DIR)/app_list_unittests<(EXECUTABLE_SUFFIX)', 20 '<(PRODUCT_DIR)/app_list_unittests<(EXECUTABLE_SUFFIX)',
21 '--brave-new-test-launcher', 21 '--brave-new-test-launcher',
22 '--test-launcher-bot-mode', 22 '--test-launcher-bot-mode',
23 '--asan=<(asan)', 23 '--asan=<(asan)',
24 '--lsan=<(lsan)', 24 '--lsan=<(lsan)',
25 ], 25 ],
26 'files': [ 26 'files': [
27 '../../testing/xvfb.py', 27 '../../testing/xvfb.py',
28 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
29 ],
30 },
31 }],
32 ['OS=="linux"', {
33 'variables': {
34 'files': [
28 '<(PRODUCT_DIR)/libosmesa.so', 35 '<(PRODUCT_DIR)/libosmesa.so',
29 ], 36 ],
30 }, 37 },
31 }], 38 }],
32 ['OS=="linux" and use_ozone==0', {
33 'variables': {
34 'files': [
35 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
36 ],
37 },
38 }],
39 ['OS=="mac"', { 39 ['OS=="mac"', {
40 'variables': { 40 'variables': {
41 'files': [ 41 'files': [
42 '<(PRODUCT_DIR)/osmesa.so', 42 '<(PRODUCT_DIR)/osmesa.so',
43 ], 43 ],
44 }, 44 },
45 }], 45 }],
46 ['OS=="win"', { 46 ['OS=="win"', {
47 'variables': { 47 'variables': {
48 'files': [ 48 'files': [
49 '<(PRODUCT_DIR)/osmesa.dll', 49 '<(PRODUCT_DIR)/osmesa.dll',
50 ], 50 ],
51 }, 51 },
52 }], 52 }],
53 ['OS=="mac" or OS=="win"', { 53 ['OS=="mac" or OS=="win" or use_ozone==1', {
54 'variables': { 54 'variables': {
55 'command': [ 55 'command': [
56 '../../testing/test_env.py', 56 '../../testing/test_env.py',
57 '<(PRODUCT_DIR)/app_list_unittests<(EXECUTABLE_SUFFIX)', 57 '<(PRODUCT_DIR)/app_list_unittests<(EXECUTABLE_SUFFIX)',
58 '--brave-new-test-launcher', 58 '--brave-new-test-launcher',
59 '--test-launcher-bot-mode', 59 '--test-launcher-bot-mode',
60 '--asan=<(asan)', 60 '--asan=<(asan)',
61 '--lsan=<(lsan)', 61 '--lsan=<(lsan)',
62 ], 62 ],
63 }, 63 },
64 }], 64 }],
65 ], 65 ],
66 'includes': [ 66 'includes': [
67 '../../base/base.isolate', 67 '../../base/base.isolate',
68 ], 68 ],
69 } 69 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698