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

Side by Side Diff: chrome/browser_tests.isolate

Issue 574753004: lib32/ doesn't exist on OSX x64 build. Update browser_tests accordingly. (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: . Created 6 years, 2 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 | tools/isolate_driver.py » ('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 'includes': [ 5 'includes': [
6 'chrome.isolate', 6 'chrome.isolate',
7 ], 7 ],
8 'conditions': [ 8 'conditions': [
9 ['OS=="linux"', { 9 ['OS=="linux"', {
10 'variables': { 10 'variables': {
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 ], 100 ],
101 }, 101 },
102 }], 102 }],
103 ['OS=="mac"', { 103 ['OS=="mac"', {
104 'variables': { 104 'variables': {
105 'isolate_dependency_tracked': [ 105 'isolate_dependency_tracked': [
106 '<(PRODUCT_DIR)/clearkeycdmadapter.plugin', 106 '<(PRODUCT_DIR)/clearkeycdmadapter.plugin',
107 '<(PRODUCT_DIR)/content_shell.pak', 107 '<(PRODUCT_DIR)/content_shell.pak',
108 '<(PRODUCT_DIR)/libclearkeycdm.dylib', 108 '<(PRODUCT_DIR)/libclearkeycdm.dylib',
109 '<(PRODUCT_DIR)/osmesa.so', 109 '<(PRODUCT_DIR)/osmesa.so',
110 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests',
111 ],
112 'isolate_dependency_untracked': [
113 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/',
114 '<(PRODUCT_DIR)/plugins/test_netscape_plugin.plugin/',
115 ],
116 },
117 }],
118 ['OS=="mac" and target_arch=="ia32"', {
119 'variables': {
120 'isolate_dependency_tracked': [
121 '<(PRODUCT_DIR)/lib32/',
110 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x32.nexe', 122 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x32.nexe',
111 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_x32.nexe', 123 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_x32.nexe',
112 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x32.nexe', 124 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x32.nexe',
113 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests',
114 ],
115 'isolate_dependency_untracked': [
116 '<(PRODUCT_DIR)/lib32/',
117 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/',
118 '<(PRODUCT_DIR)/plugins/test_netscape_plugin.plugin/',
119 ], 125 ],
120 }, 126 },
121 }], 127 }],
122 ['OS=="mac" or OS=="win"', { 128 ['OS=="mac" or OS=="win"', {
123 'variables': { 129 'variables': {
124 'command': [ 130 'command': [
125 '../testing/test_env.py', 131 '../testing/test_env.py',
126 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', 132 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
127 '--test-launcher-bot-mode', 133 '--test-launcher-bot-mode',
128 ], 134 ],
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 '../ui/file_manager/file_manager/', 178 '../ui/file_manager/file_manager/',
173 '../ui/webui/resources/js/', 179 '../ui/webui/resources/js/',
174 '<(PRODUCT_DIR)/chromevox_test_data/', 180 '<(PRODUCT_DIR)/chromevox_test_data/',
175 '<(PRODUCT_DIR)/locales/', 181 '<(PRODUCT_DIR)/locales/',
176 '<(PRODUCT_DIR)/resources/chromeos/', 182 '<(PRODUCT_DIR)/resources/chromeos/',
177 ], 183 ],
178 }, 184 },
179 }], 185 }],
180 ], 186 ],
181 } 187 }
OLDNEW
« no previous file with comments | « no previous file | tools/isolate_driver.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698