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

Side by Side Diff: trunk/src/chrome/interactive_ui_tests.isolate

Issue 14615011: Revert 198675 "Reland 198495 for Windows." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 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
« no previous file with comments | « trunk/src/chrome/chrome.isolate ('k') | trunk/src/chrome/sync_integration_tests.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 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=="linux"', { 6 ['OS=="linux"', {
7 'variables': { 7 'variables': {
8 'command': [ 8 'command': [
9 '../testing/xvfb.py', 9 '../testing/xvfb.py',
10 '<(PRODUCT_DIR)', 10 '<(PRODUCT_DIR)',
11 '../tools/swarm_client/run_test_cases.py', 11 '../tools/swarm_client/run_test_cases.py',
12 '-j1', 12 '-j1',
13 '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)', 13 '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
14 ], 14 ],
15 'isolate_dependency_tracked': [ 15 'isolate_dependency_tracked': [
16 '../testing/xvfb.py', 16 '../testing/xvfb.py',
17 '<(PRODUCT_DIR)/chrome.pak', 17 '<(PRODUCT_DIR)/chrome.pak',
18 '<(PRODUCT_DIR)/lib/libpeerconnection.so',
19 '<(PRODUCT_DIR)/libffmpegsumo.so', 18 '<(PRODUCT_DIR)/libffmpegsumo.so',
20 '<(PRODUCT_DIR)/locales/fr.pak', 19 '<(PRODUCT_DIR)/locales/fr.pak',
21 '<(PRODUCT_DIR)/pyproto/google/__init__.py', 20 '<(PRODUCT_DIR)/pyproto/google/__init__.py',
22 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 21 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
23 ], 22 ],
24 }, 23 },
25 }], 24 }],
26 ['OS=="linux" or OS=="mac" or OS=="win"', { 25 ['OS=="linux" or OS=="mac" or OS=="win"', {
27 'variables': { 26 'variables': {
28 'isolate_dependency_tracked': [ 27 'isolate_dependency_tracked': [
(...skipping 27 matching lines...) Expand all
56 'isolate_dependency_tracked': [ 55 'isolate_dependency_tracked': [
57 '<(PRODUCT_DIR)/chrome_100_percent.pak', 56 '<(PRODUCT_DIR)/chrome_100_percent.pak',
58 '<(PRODUCT_DIR)/locales/en-US.pak', 57 '<(PRODUCT_DIR)/locales/en-US.pak',
59 ], 58 ],
60 }, 59 },
61 }], 60 }],
62 ['OS=="mac"', { 61 ['OS=="mac"', {
63 'variables': { 62 'variables': {
64 'isolate_dependency_tracked': [ 63 'isolate_dependency_tracked': [
65 '<(PRODUCT_DIR)/ffmpegsumo.so', 64 '<(PRODUCT_DIR)/ffmpegsumo.so',
66 '<(PRODUCT_DIR)/libpeerconnection.so',
67 ], 65 ],
68 'isolate_dependency_untracked': [ 66 'isolate_dependency_untracked': [
69 '<(PRODUCT_DIR)/Chromium Framework.framework/', 67 '<(PRODUCT_DIR)/Chromium Framework.framework/',
70 '<(PRODUCT_DIR)/Chromium.app/', 68 '<(PRODUCT_DIR)/Chromium.app/',
71 ], 69 ],
72 }, 70 },
73 }], 71 }],
74 ['OS=="mac" or OS=="win"', { 72 ['OS=="mac" or OS=="win"', {
75 'variables': { 73 'variables': {
76 'command': [ 74 'command': [
77 '../testing/test_env.py', 75 '../testing/test_env.py',
78 '../tools/swarm_client/run_test_cases.py', 76 '../tools/swarm_client/run_test_cases.py',
79 '-j1', 77 '-j1',
80 '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)', 78 '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
81 ], 79 ],
82 }, 80 },
83 }], 81 }],
84 ['OS=="win"', { 82 ['OS=="win"', {
85 'variables': { 83 'variables': {
86 'isolate_dependency_tracked': [ 84 'isolate_dependency_tracked': [
87 '../net/data/ssl/certificates/foaf.me.chromium-test-cert.der', 85 '../net/data/ssl/certificates/foaf.me.chromium-test-cert.der',
88 '../net/data/ssl/certificates/mit.davidben.der', 86 '../net/data/ssl/certificates/mit.davidben.der',
89 '<(PRODUCT_DIR)/d3dcompiler_46.dll', 87 '<(PRODUCT_DIR)/d3dcompiler_46.dll',
90 '<(PRODUCT_DIR)/ffmpegsumo.dll', 88 '<(PRODUCT_DIR)/ffmpegsumo.dll',
91 '<(PRODUCT_DIR)/icudt.dll', 89 '<(PRODUCT_DIR)/icudt.dll',
92 '<(PRODUCT_DIR)/libEGL.dll', 90 '<(PRODUCT_DIR)/libEGL.dll',
93 '<(PRODUCT_DIR)/libGLESv2.dll', 91 '<(PRODUCT_DIR)/libGLESv2.dll',
94 '<(PRODUCT_DIR)/libpeerconnection.dll',
95 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 92 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
96 ], 93 ],
97 'isolate_dependency_untracked': [ 94 'isolate_dependency_untracked': [
98 '../third_party/python_26/', 95 '../third_party/python_26/',
99 ], 96 ],
100 }, 97 },
101 }], 98 }],
102 ], 99 ],
103 } 100 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/chrome.isolate ('k') | trunk/src/chrome/sync_integration_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698