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

Side by Side Diff: chrome/browser_tests.isolate

Issue 605063004: Pass lsan GYP variable to swarming's test_env so that we can disable the sandbox when it's set. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix nacl 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 | « build/isolate.gypi ('k') | chrome/interactive_ui_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 (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 '--lsan=<(lsan)',
16 ], 17 ],
17 'isolate_dependency_tracked': [ 18 'isolate_dependency_tracked': [
18 '../testing/xvfb.py', 19 '../testing/xvfb.py',
19 '<(PRODUCT_DIR)/libclearkeycdm.so', 20 '<(PRODUCT_DIR)/libclearkeycdm.so',
20 '<(PRODUCT_DIR)/libclearkeycdmadapter.so', 21 '<(PRODUCT_DIR)/libclearkeycdmadapter.so',
21 '<(PRODUCT_DIR)/libppapi_tests.so', 22 '<(PRODUCT_DIR)/libppapi_tests.so',
22 ], 23 ],
23 }, 24 },
24 }], 25 }],
25 ['OS=="linux" and use_ozone==0', { 26 ['OS=="linux" and use_ozone==0', {
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 '../ui/file_manager/file_manager/', 179 '../ui/file_manager/file_manager/',
179 '../ui/webui/resources/js/', 180 '../ui/webui/resources/js/',
180 '<(PRODUCT_DIR)/chromevox_test_data/', 181 '<(PRODUCT_DIR)/chromevox_test_data/',
181 '<(PRODUCT_DIR)/locales/', 182 '<(PRODUCT_DIR)/locales/',
182 '<(PRODUCT_DIR)/resources/chromeos/', 183 '<(PRODUCT_DIR)/resources/chromeos/',
183 ], 184 ],
184 }, 185 },
185 }], 186 }],
186 ], 187 ],
187 } 188 }
OLDNEW
« no previous file with comments | « build/isolate.gypi ('k') | chrome/interactive_ui_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698