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

Side by Side Diff: trunk/src/chrome/browser_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 | « no previous file | trunk/src/chrome/chrome.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 (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=="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 '--use-less-jobs', 12 '--use-less-jobs',
13 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', 13 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
14 ], 14 ],
15 'isolate_dependency_tracked': [ 15 'isolate_dependency_tracked': [
16 '../testing/xvfb.py', 16 '../testing/xvfb.py',
17 '<(PRODUCT_DIR)/DumpRenderTree<(EXECUTABLE_SUFFIX)',
17 '<(PRODUCT_DIR)/chrome.pak', 18 '<(PRODUCT_DIR)/chrome.pak',
18 '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)', 19 '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)',
19 '<(PRODUCT_DIR)/DumpRenderTree<(EXECUTABLE_SUFFIX)',
20 '<(PRODUCT_DIR)/lib/libpeerconnection.so',
21 '<(PRODUCT_DIR)/libclearkeycdm.so', 20 '<(PRODUCT_DIR)/libclearkeycdm.so',
22 '<(PRODUCT_DIR)/libclearkeycdmadapter.so', 21 '<(PRODUCT_DIR)/libclearkeycdmadapter.so',
23 '<(PRODUCT_DIR)/libffmpegsumo.so', 22 '<(PRODUCT_DIR)/libffmpegsumo.so',
24 '<(PRODUCT_DIR)/libosmesa.so', 23 '<(PRODUCT_DIR)/libosmesa.so',
24 '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
25 '<(PRODUCT_DIR)/libppapi_tests.so', 25 '<(PRODUCT_DIR)/libppapi_tests.so',
26 '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
27 '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)', 26 '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
28 '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)', 27 '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',
29 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 28 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
30 'browser/nacl_host/test/debug_stub_browser_tests.py', 29 'browser/nacl_host/test/debug_stub_browser_tests.py',
31 'browser/nacl_host/test/gdb_rsp.py', 30 'browser/nacl_host/test/gdb_rsp.py',
32 ], 31 ],
33 }, 32 },
34 }], 33 }],
35 ['OS=="linux" or OS=="mac" or OS=="win"', { 34 ['OS=="linux" or OS=="mac" or OS=="win"', {
36 'variables': { 35 'variables': {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 '<(PRODUCT_DIR)/plugins/', 93 '<(PRODUCT_DIR)/plugins/',
95 '<(PRODUCT_DIR)/resources/extension/', 94 '<(PRODUCT_DIR)/resources/extension/',
96 '<(PRODUCT_DIR)/test_url_loader_data/', 95 '<(PRODUCT_DIR)/test_url_loader_data/',
97 ], 96 ],
98 }, 97 },
99 }], 98 }],
100 ['OS=="mac"', { 99 ['OS=="mac"', {
101 'variables': { 100 'variables': {
102 'isolate_dependency_tracked': [ 101 'isolate_dependency_tracked': [
103 '<(PRODUCT_DIR)/ffmpegsumo.so', 102 '<(PRODUCT_DIR)/ffmpegsumo.so',
104 '<(PRODUCT_DIR)/libpeerconnection.so', 103 '<(PRODUCT_DIR)/plugins/TestNetscapePlugIn.plugin/Contents/Info.plist' ,
104 '<(PRODUCT_DIR)/plugins/TestNetscapePlugIn.plugin/Contents/MacOS/TestN etscapePlugIn',
105 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/Contents/Info.plist', 105 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/Contents/Info.plist',
106 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/Contents/MacOS/npapi_ test_plugin', 106 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/Contents/MacOS/npapi_ test_plugin',
107 '<(PRODUCT_DIR)/plugins/TestNetscapePlugIn.plugin/Contents/Info.plist' ,
108 '<(PRODUCT_DIR)/plugins/TestNetscapePlugIn.plugin/Contents/MacOS/TestN etscapePlugIn',
109 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x32.nexe', 107 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x32.nexe',
110 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests', 108 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests',
111 ], 109 ],
112 'isolate_dependency_untracked': [ 110 'isolate_dependency_untracked': [
113 '<(PRODUCT_DIR)/Chromium Framework.framework/', 111 '<(PRODUCT_DIR)/Chromium Framework.framework/',
114 '<(PRODUCT_DIR)/Chromium.app/', 112 '<(PRODUCT_DIR)/Chromium.app/',
115 ], 113 ],
116 }, 114 },
117 }], 115 }],
118 ['OS=="mac" or OS=="win"', { 116 ['OS=="mac" or OS=="win"', {
119 'variables': { 117 'variables': {
120 'command': [ 118 'command': [
121 '../testing/test_env.py', 119 '../testing/test_env.py',
122 '../tools/swarm_client/run_test_cases.py', 120 '../tools/swarm_client/run_test_cases.py',
123 '--use-less-jobs', 121 '--use-less-jobs',
124 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', 122 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
125 ], 123 ],
126 }, 124 },
127 }], 125 }],
128 ['OS=="win"', { 126 ['OS=="win"', {
129 'variables': { 127 'variables': {
130 'isolate_dependency_tracked': [ 128 'isolate_dependency_tracked': [
131 '../native_client/build/build_nexe.py', 129 '../native_client/build/build_nexe.py',
132 '../third_party/cygwin/bin/bash.exe', 130 '../third_party/cygwin/bin/bash.exe',
133 '../third_party/cygwin/setup_mount.bat', 131 '../third_party/cygwin/setup_mount.bat',
132 '<(PRODUCT_DIR)/D3DCompiler_43.dll',
134 '<(PRODUCT_DIR)/clearkeycdm.dll', 133 '<(PRODUCT_DIR)/clearkeycdm.dll',
135 '<(PRODUCT_DIR)/clearkeycdmadapter.dll', 134 '<(PRODUCT_DIR)/clearkeycdmadapter.dll',
136 '<(PRODUCT_DIR)/D3DCompiler_43.dll',
137 '<(PRODUCT_DIR)/d3dcompiler_46.dll', 135 '<(PRODUCT_DIR)/d3dcompiler_46.dll',
138 '<(PRODUCT_DIR)/ffmpegsumo.dll', 136 '<(PRODUCT_DIR)/ffmpegsumo.dll',
139 '<(PRODUCT_DIR)/icudt.dll', 137 '<(PRODUCT_DIR)/icudt.dll',
140 '<(PRODUCT_DIR)/libEGL.dll', 138 '<(PRODUCT_DIR)/libEGL.dll',
141 '<(PRODUCT_DIR)/libGLESv2.dll', 139 '<(PRODUCT_DIR)/libGLESv2.dll',
142 '<(PRODUCT_DIR)/libpeerconnection.dll',
143 '<(PRODUCT_DIR)/nacl64<(EXECUTABLE_SUFFIX)', 140 '<(PRODUCT_DIR)/nacl64<(EXECUTABLE_SUFFIX)',
144 '<(PRODUCT_DIR)/osmesa.dll', 141 '<(PRODUCT_DIR)/osmesa.dll',
142 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
145 '<(PRODUCT_DIR)/ppapi_tests.dll', 143 '<(PRODUCT_DIR)/ppapi_tests.dll',
146 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
147 '<(PRODUCT_DIR)/security_tests.dll', 144 '<(PRODUCT_DIR)/security_tests.dll',
148 'tools/build/repack_locales.py', 145 'tools/build/repack_locales.py',
149 ], 146 ],
150 'isolate_dependency_untracked': [ 147 'isolate_dependency_untracked': [
151 '../third_party/npapi/npspy/extern/plugin/', 148 '../third_party/npapi/npspy/extern/plugin/',
152 '../third_party/psyco_win32/psyco/', 149 '../third_party/psyco_win32/psyco/',
153 '../third_party/python_26/', 150 '../third_party/python_26/',
154 ], 151 ],
155 }, 152 },
156 }], 153 }],
157 ], 154 ],
158 } 155 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/chrome/chrome.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698