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

Side by Side Diff: content/content_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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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_untracked': [ 8 'isolate_dependency_untracked': [
9 '../media/test/data/', 9 '../media/test/data/',
10 '../webkit/data/', 10 '../webkit/data/',
11 'test/data/', 11 'test/data/',
12 ], 12 ],
13 }, 13 },
14 }], 14 }],
15 ['OS=="android" or OS=="mac"', { 15 ['OS=="android" or OS=="mac"', {
16 'variables': { 16 'variables': {
17 'isolate_dependency_tracked': [ 17 'isolate_dependency_tracked': [
18 '<(PRODUCT_DIR)/content_resources.pak', 18 '<(PRODUCT_DIR)/content_resources.pak',
19 ], 19 ],
20 }, 20 },
21 }], 21 }],
22 ['OS=="linux"', { 22 ['OS=="linux"', {
23 'variables': { 23 'variables': {
24 'command': [ 24 'command': [
25 '../testing/xvfb.py', 25 '../testing/xvfb.py',
26 '<(PRODUCT_DIR)', 26 '<(PRODUCT_DIR)',
27 '../tools/swarming_client/googletest/run_test_cases.py', 27 '../tools/swarm_client/googletest/run_test_cases.py',
28 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', 28 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
29 ], 29 ],
30 'isolate_dependency_tracked': [ 30 'isolate_dependency_tracked': [
31 '<(PRODUCT_DIR)/libffmpegsumo.so', 31 '<(PRODUCT_DIR)/libffmpegsumo.so',
32 ], 32 ],
33 'isolate_dependency_untracked': [ 33 'isolate_dependency_untracked': [
34 '<(PRODUCT_DIR)/test_data/', 34 '<(PRODUCT_DIR)/test_data/',
35 ], 35 ],
36 }, 36 },
37 }], 37 }],
38 ['OS=="linux" or OS=="mac" or OS=="win"', { 38 ['OS=="linux" or OS=="mac" or OS=="win"', {
39 'variables': { 39 'variables': {
40 'isolate_dependency_tracked': [ 40 'isolate_dependency_tracked': [
41 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', 41 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
42 ], 42 ],
43 }, 43 },
44 }], 44 }],
45 ['OS=="mac"', { 45 ['OS=="mac"', {
46 'variables': { 46 'variables': {
47 'isolate_dependency_tracked': [ 47 'isolate_dependency_tracked': [
48 '<(PRODUCT_DIR)/ffmpegsumo.so', 48 '<(PRODUCT_DIR)/ffmpegsumo.so',
49 ], 49 ],
50 }, 50 },
51 }], 51 }],
52 ['OS=="mac" or OS=="win"', { 52 ['OS=="mac" or OS=="win"', {
53 'variables': { 53 'variables': {
54 'command': [ 54 'command': [
55 '../testing/test_env.py', 55 '../testing/test_env.py',
56 '../tools/swarming_client/googletest/run_test_cases.py', 56 '../tools/swarm_client/googletest/run_test_cases.py',
57 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', 57 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
58 ], 58 ],
59 }, 59 },
60 }], 60 }],
61 ['OS=="win"', { 61 ['OS=="win"', {
62 'variables': { 62 'variables': {
63 'isolate_dependency_tracked': [ 63 'isolate_dependency_tracked': [
64 '<(PRODUCT_DIR)/ffmpegsumo.dll', 64 '<(PRODUCT_DIR)/ffmpegsumo.dll',
65 '<(PRODUCT_DIR)/icudt.dll', 65 '<(PRODUCT_DIR)/icudt.dll',
66 ], 66 ],
67 }, 67 },
68 }], 68 }],
69 ], 69 ],
70 } 70 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698