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

Side by Side Diff: crypto/crypto_unittests.isolate

Issue 996173004: Convert more isolate files to respect use_x11 for Xvfb usage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 | « components/components_unittests.isolate ('k') | extensions/extensions_browsertests.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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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==0', {
M-A Ruel 2015/03/11 18:31:35 This one probably doesn't need X but it's not a bi
7 'variables': {
8 'command': [
9 '../testing/test_env.py',
10 '<(PRODUCT_DIR)/crypto_unittests<(EXECUTABLE_SUFFIX)',
11 '--brave-new-test-launcher',
12 '--test-launcher-bot-mode',
13 '--asan=<(asan)',
14 '--msan=<(msan)',
15 '--tsan=<(tsan)',
16 ],
17 },
18 }],
19 ['use_x11==1', {
7 'variables': { 20 'variables': {
8 'command': [ 21 'command': [
9 '../testing/xvfb.py', 22 '../testing/xvfb.py',
10 '<(PRODUCT_DIR)', 23 '<(PRODUCT_DIR)',
11 '<(PRODUCT_DIR)/crypto_unittests<(EXECUTABLE_SUFFIX)', 24 '<(PRODUCT_DIR)/crypto_unittests<(EXECUTABLE_SUFFIX)',
12 '--brave-new-test-launcher', 25 '--brave-new-test-launcher',
13 '--test-launcher-bot-mode', 26 '--test-launcher-bot-mode',
14 '--asan=<(asan)', 27 '--asan=<(asan)',
15 '--msan=<(msan)', 28 '--msan=<(msan)',
16 '--tsan=<(tsan)', 29 '--tsan=<(tsan)',
(...skipping 12 matching lines...) Expand all
29 }], 42 }],
30 ['OS=="linux" or OS=="mac" or OS=="win"', { 43 ['OS=="linux" or OS=="mac" or OS=="win"', {
31 'variables': { 44 'variables': {
32 'files': [ 45 'files': [
33 '../testing/test_env.py', 46 '../testing/test_env.py',
34 '<(PRODUCT_DIR)/crypto_unittests<(EXECUTABLE_SUFFIX)', 47 '<(PRODUCT_DIR)/crypto_unittests<(EXECUTABLE_SUFFIX)',
35 ], 48 ],
36 'read_only': 1, 49 'read_only': 1,
37 }, 50 },
38 }], 51 }],
39 ['OS=="mac" or OS=="win"', {
40 'variables': {
41 'command': [
42 '../testing/test_env.py',
43 '<(PRODUCT_DIR)/crypto_unittests<(EXECUTABLE_SUFFIX)',
44 '--brave-new-test-launcher',
45 '--test-launcher-bot-mode',
46 '--asan=<(asan)',
47 '--msan=<(msan)',
48 '--tsan=<(tsan)',
49 ],
50 },
51 }],
52 ['OS=="mac" and asan==1 and fastbuild==0', { 52 ['OS=="mac" and asan==1 and fastbuild==0', {
53 'variables': { 53 'variables': {
54 'files': [ 54 'files': [
55 '<(PRODUCT_DIR)/crypto_unittests.dSYM/', 55 '<(PRODUCT_DIR)/crypto_unittests.dSYM/',
56 ], 56 ],
57 }, 57 },
58 }], 58 }],
59 ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 59 ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
60 'variables': { 60 'variables': {
61 'files': [ 61 'files': [
62 '<(PRODUCT_DIR)/crypto_unittests.exe.pdb', 62 '<(PRODUCT_DIR)/crypto_unittests.exe.pdb',
63 ], 63 ],
64 }, 64 },
65 }], 65 }],
66 ], 66 ],
67 'includes': [ 67 'includes': [
68 '../base/base.isolate', 68 '../base/base.isolate',
69 ], 69 ],
70 } 70 }
OLDNEW
« no previous file with comments | « components/components_unittests.isolate ('k') | extensions/extensions_browsertests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698