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

Side by Side Diff: components/components_browsertests.isolate

Issue 863023003: Make components_browsertests swarmable and add to main waterfall. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add copyright header to isolate-file. 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 | « no previous file | components/components_tests.gyp » ('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 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 'includes': [
6 '../base/base.isolate',
7 '../gin/v8.isolate',
jam 2015/01/22 16:42:56 you sure you need this?
nyquist 2015/01/22 22:47:33 Yes, otherwise the tests would fail with no visibl
8 ],
5 'conditions': [ 9 'conditions': [
6 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 10 ['OS=="linux" or OS=="mac" or OS=="win"', {
7 'variables': { 11 'variables': {
8 'files': [ 12 'files': [
9 'test/data/', 13 'test/data/',
14 '../media/test/data/',
15 '../net/data/',
jam 2015/01/22 16:42:56 just to be clear, these two directories are needed
nyquist 2015/01/22 22:47:33 Apparently not. Removed a few more.
16 '../net/tools/testserver/',
17 '../testing/test_env.py',
18 '../third_party/pyftpdlib/',
19 '../third_party/pywebsocket/',
20 '../third_party/tlslite/',
21 '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)',
22 '<(PRODUCT_DIR)/components_resources.pak',
23 '<(PRODUCT_DIR)/content_shell.pak',
jam 2015/01/22 16:42:55 do you know what is using this pak file? it's stra
nyquist 2015/01/22 22:47:33 The test DistillerPageWebContentsTest.TestTitleAnd
jam 2015/01/23 17:35:07 I see, ok.
10 ], 24 ],
11 }, 25 },
12 }], 26 }],
13 ['OS=="linux"', { 27 ['OS=="linux"', {
14 'variables': { 28 'variables': {
15 'command': [ 29 'command': [
16 '../testing/xvfb.py', 30 '../testing/xvfb.py',
17 '<(PRODUCT_DIR)', 31 '<(PRODUCT_DIR)',
18 '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', 32 '<(PRODUCT_DIR)/components_browsertests',
19 '--brave-new-test-launcher', 33 '--brave-new-test-launcher',
20 '--test-launcher-bot-mode', 34 '--test-launcher-bot-mode',
21 '--asan=<(asan)', 35 '--asan=<(asan)',
22 '--lsan=<(lsan)', 36 '--lsan=<(lsan)',
23 ], 37 ],
24 'files': [ 38 'files': [
25 '../testing/xvfb.py', 39 '../testing/xvfb.py',
40 '<(PRODUCT_DIR)/libosmesa.so',
26 ], 41 ],
27 }, 42 },
28 }], 43 }],
29 ['OS=="linux" and use_ozone==0', { 44 ['OS=="linux" and use_ozone==0', {
30 'variables': { 45 'variables': {
31 'files': [ 46 'files': [
32 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 47 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
33 ], 48 ],
34 }, 49 },
35 }], 50 }],
36 ['OS=="linux" or OS=="mac" or OS=="win"', {
37 'variables': {
38 'files': [
39 '../testing/test_env.py',
40 '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
41 ],
42 'read_only': 1,
43 },
44 }],
45 ['OS=="mac" or OS=="win"', { 51 ['OS=="mac" or OS=="win"', {
46 'variables': { 52 'variables': {
47 'command': [ 53 'command': [
48 '../testing/test_env.py', 54 '../testing/test_env.py',
49 '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', 55 '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)',
50 '--brave-new-test-launcher', 56 '--brave-new-test-launcher',
51 '--test-launcher-bot-mode', 57 '--test-launcher-bot-mode',
52 '--asan=<(asan)', 58 '--asan=<(asan)',
53 '--lsan=<(lsan)', 59 '--lsan=<(lsan)',
54 ], 60 ],
55 }, 61 },
56 }], 62 }],
57 ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 63 ['OS=="mac"', {
58 'variables': { 64 'variables': {
59 'files': [ 65 'files': [
60 '<(PRODUCT_DIR)/base_unittests.exe.pdb', 66 '<(PRODUCT_DIR)/Content Shell.app/',
jam 2015/01/22 16:42:56 are you sure you need this?
nyquist 2015/01/22 22:47:33 I believe so, though I don't have a Mac. However,
61 ], 67 ],
62 }, 68 },
63 }], 69 }],
64 ], 70 ],
65 'includes': [
66 'base.isolate',
67 ],
68 } 71 }
OLDNEW
« no previous file with comments | « no previous file | components/components_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698