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

Side by Side Diff: net/net_unittests.isolate

Issue 22978003: Revert r217535 "Move swarm_client to swarming_client." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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 | Annotate | Revision Log
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 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 6 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
7 'variables': { 7 'variables': {
8 'isolate_dependency_tracked': [ 8 'isolate_dependency_tracked': [
9 '../chrome/test/data/animate1.gif', 9 '../chrome/test/data/animate1.gif',
10 '../chrome/test/data/server-unavailable.html', 10 '../chrome/test/data/server-unavailable.html',
11 '../chrome/test/data/server-unavailable.html.mock-http-headers', 11 '../chrome/test/data/server-unavailable.html.mock-http-headers',
12 '../chrome/test/data/simple.html', 12 '../chrome/test/data/simple.html',
13 ], 13 ],
14 'isolate_dependency_untracked': [ 14 'isolate_dependency_untracked': [
15 'data/', 15 'data/',
16 ], 16 ],
17 }, 17 },
18 }], 18 }],
19 ['OS=="linux"', { 19 ['OS=="linux"', {
20 'variables': { 20 'variables': {
21 'command': [ 21 'command': [
22 '../testing/xvfb.py', 22 '../testing/xvfb.py',
23 '<(PRODUCT_DIR)', 23 '<(PRODUCT_DIR)',
24 '../tools/swarming_client/googletest/run_test_cases.py', 24 '../tools/swarm_client/googletest/run_test_cases.py',
25 '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', 25 '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)',
26 ], 26 ],
27 'isolate_dependency_tracked': [ 27 'isolate_dependency_tracked': [
28 '../testing/xvfb.py', 28 '../testing/xvfb.py',
29 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 29 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
30 ], 30 ],
31 }, 31 },
32 }], 32 }],
33 ['OS=="linux" or OS=="mac" or OS=="win"', { 33 ['OS=="linux" or OS=="mac" or OS=="win"', {
34 'variables': { 34 'variables': {
35 'isolate_dependency_tracked': [ 35 'isolate_dependency_tracked': [
36 '../testing/test_env.py', 36 '../testing/test_env.py',
37 '../tools/swarming_client/run_isolated.py', 37 '../tools/swarm_client/run_isolated.py',
38 '../tools/swarming_client/googletest/run_test_cases.py', 38 '../tools/swarm_client/googletest/run_test_cases.py',
39 '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', 39 '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)',
40 ], 40 ],
41 'isolate_dependency_untracked': [ 41 'isolate_dependency_untracked': [
42 '../third_party/pyftpdlib/', 42 '../third_party/pyftpdlib/',
43 '../third_party/pywebsocket/', 43 '../third_party/pywebsocket/',
44 '../third_party/tlslite/', 44 '../third_party/tlslite/',
45 '<(PRODUCT_DIR)/pyproto/', 45 '<(PRODUCT_DIR)/pyproto/',
46 'tools/testserver/', 46 'tools/testserver/',
47 ], 47 ],
48 }, 48 },
49 }], 49 }],
50 ['OS=="mac" or OS=="win"', { 50 ['OS=="mac" or OS=="win"', {
51 'variables': { 51 'variables': {
52 'command': [ 52 'command': [
53 '../testing/test_env.py', 53 '../testing/test_env.py',
54 '../tools/swarming_client/googletest/run_test_cases.py', 54 '../tools/swarm_client/googletest/run_test_cases.py',
55 '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', 55 '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)',
56 ], 56 ],
57 }, 57 },
58 }], 58 }],
59 ['OS=="win"', { 59 ['OS=="win"', {
60 'variables': { 60 'variables': {
61 'isolate_dependency_tracked': [ 61 'isolate_dependency_tracked': [
62 '<(PRODUCT_DIR)/icudt.dll', 62 '<(PRODUCT_DIR)/icudt.dll',
63 ], 63 ],
64 'isolate_dependency_untracked': [ 64 'isolate_dependency_untracked': [
65 '../third_party/python_26/', 65 '../third_party/python_26/',
66 ], 66 ],
67 }, 67 },
68 }], 68 }],
69 ], 69 ],
70 } 70 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698