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

Side by Side Diff: chrome/browser_tests.isolate

Issue 140263002: Fixes to make GPU tests run in isolated mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed unneeded bitmaptools dependency. Created 6 years, 11 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 | « chrome/angle.isolate ('k') | 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 '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': {
11 'command': [ 11 'command': [
12 '../testing/xvfb.py', 12 '../testing/xvfb.py',
13 '<(PRODUCT_DIR)', 13 '<(PRODUCT_DIR)',
14 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', 14 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
15 '--test-launcher-bot-mode', 15 '--test-launcher-bot-mode',
16 ], 16 ],
17 'isolate_dependency_tracked': [ 17 'isolate_dependency_tracked': [
18 '../testing/xvfb.py', 18 '../testing/xvfb.py',
19 '<(PRODUCT_DIR)/libclearkeycdm.so',
20 '<(PRODUCT_DIR)/libclearkeycdmadapter.so',
19 '<(PRODUCT_DIR)/libppapi_tests.so', 21 '<(PRODUCT_DIR)/libppapi_tests.so',
20 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 22 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
21 ], 23 ],
22 'isolate_dependency_untracked': [ 24 'isolate_dependency_untracked': [
23 '<(PRODUCT_DIR)/chromevox_test_data/', 25 '<(PRODUCT_DIR)/chromevox_test_data/',
24 ], 26 ],
25 }, 27 },
26 }], 28 }],
27 ['OS=="linux" or OS=="mac"', { 29 ['OS=="linux" or OS=="mac"', {
28 'variables': { 30 'variables': {
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 ['OS=="linux" or OS=="win"', { 85 ['OS=="linux" or OS=="win"', {
84 'variables': { 86 'variables': {
85 'isolate_dependency_tracked': [ 87 'isolate_dependency_tracked': [
86 '<(PRODUCT_DIR)/mock_nacl_gdb<(EXECUTABLE_SUFFIX)', 88 '<(PRODUCT_DIR)/mock_nacl_gdb<(EXECUTABLE_SUFFIX)',
87 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x64.nexe', 89 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x64.nexe',
88 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_x64.nexe', 90 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_x64.nexe',
89 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x64.nexe', 91 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x64.nexe',
90 ], 92 ],
91 'isolate_dependency_untracked': [ 93 'isolate_dependency_untracked': [
92 '../third_party/bidichecker/', 94 '../third_party/bidichecker/',
95 '<(PRODUCT_DIR)/lib64/',
96 '<(PRODUCT_DIR)/plugins/',
93 ], 97 ],
94 }, 98 },
95 }], 99 }],
96 ['OS=="mac"', { 100 ['OS=="mac"', {
97 'variables': { 101 'variables': {
98 'isolate_dependency_tracked': [ 102 'isolate_dependency_tracked': [
103 '<(PRODUCT_DIR)/clearkeycdmadapter.plugin',
104 '<(PRODUCT_DIR)/libclearkeycdm.dylib',
99 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x32.nexe', 105 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x32.nexe',
100 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_x32.nexe', 106 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_x32.nexe',
101 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x32.nexe', 107 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x32.nexe',
102 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests', 108 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests',
103 ], 109 ],
104 'isolate_dependency_untracked': [ 110 'isolate_dependency_untracked': [
111 '<(PRODUCT_DIR)/lib32/',
105 '<(PRODUCT_DIR)/plugins/TestNetscapePlugIn.plugin/', 112 '<(PRODUCT_DIR)/plugins/TestNetscapePlugIn.plugin/',
106 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/', 113 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/',
107 ], 114 ],
108 }, 115 },
109 }], 116 }],
110 ['OS=="mac" or OS=="win"', { 117 ['OS=="mac" or OS=="win"', {
111 'variables': { 118 'variables': {
112 'command': [ 119 'command': [
113 '../testing/test_env.py', 120 '../testing/test_env.py',
114 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', 121 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
115 '--test-launcher-bot-mode', 122 '--test-launcher-bot-mode',
116 ], 123 ],
117 }, 124 },
118 }], 125 }],
119 ['OS=="win"', { 126 ['OS=="win"', {
120 'variables': { 127 'variables': {
121 'isolate_dependency_tracked': [ 128 'isolate_dependency_tracked': [
122 '../native_client/build/build_nexe.py', 129 '../native_client/build/build_nexe.py',
123 '../third_party/cygwin/bin/bash.exe', 130 '../third_party/cygwin/bin/bash.exe',
124 '../third_party/cygwin/setup_mount.bat', 131 '../third_party/cygwin/setup_mount.bat',
132 '<(PRODUCT_DIR)/clearkeycdm.dll',
133 '<(PRODUCT_DIR)/clearkeycdmadapter.dll',
125 '<(PRODUCT_DIR)/ppapi_tests.dll', 134 '<(PRODUCT_DIR)/ppapi_tests.dll',
126 '<(PRODUCT_DIR)/security_tests.dll', 135 '<(PRODUCT_DIR)/security_tests.dll',
127 'tools/build/repack_locales.py', 136 'tools/build/repack_locales.py',
128 ], 137 ],
129 'isolate_dependency_untracked': [ 138 'isolate_dependency_untracked': [
130 '../third_party/npapi/npspy/extern/plugin/', 139 '../third_party/npapi/npspy/extern/plugin/',
131 '../third_party/psyco_win32/psyco/', 140 '../third_party/psyco_win32/psyco/',
132 ], 141 ],
133 }, 142 },
134 }], 143 }],
135 ], 144 ],
136 } 145 }
OLDNEW
« no previous file with comments | « chrome/angle.isolate ('k') | chrome/chrome.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698