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

Side by Side Diff: content/content_browsertests.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: 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
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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=="android"', { 6 ['OS=="android"', {
7 'variables': { 7 'variables': {
8 'isolate_dependency_tracked': [ 8 'isolate_dependency_tracked': [
9 '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak', 9 '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',
10 ], 10 ],
(...skipping 20 matching lines...) Expand all
31 '../net/data/', 31 '../net/data/',
32 'test/data/', 32 'test/data/',
33 ], 33 ],
34 }, 34 },
35 }], 35 }],
36 ['OS=="linux"', { 36 ['OS=="linux"', {
37 'variables': { 37 'variables': {
38 'command': [ 38 'command': [
39 '../testing/xvfb.py', 39 '../testing/xvfb.py',
40 '<(PRODUCT_DIR)', 40 '<(PRODUCT_DIR)',
41 '../testing/test_env.py',
41 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', 42 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
42 '--test-launcher-bot-mode', 43 '--test-launcher-bot-mode',
44 '--lsan=<(lsan)',
43 ], 45 ],
44 'isolate_dependency_tracked': [ 46 'isolate_dependency_tracked': [
45 '../testing/xvfb.py', 47 '../testing/xvfb.py',
46 '<(PRODUCT_DIR)/content_shell.pak', 48 '<(PRODUCT_DIR)/content_shell.pak',
47 '<(PRODUCT_DIR)/libffmpegsumo.so', 49 '<(PRODUCT_DIR)/libffmpegsumo.so',
48 '<(PRODUCT_DIR)/libosmesa.so', 50 '<(PRODUCT_DIR)/libosmesa.so',
49 '<(PRODUCT_DIR)/libppapi_tests.so', 51 '<(PRODUCT_DIR)/libppapi_tests.so',
50 ], 52 ],
51 }, 53 },
52 }], 54 }],
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 'isolate_dependency_untracked': [ 114 'isolate_dependency_untracked': [
113 '<(PRODUCT_DIR)/content_browsertests.exe.pdb', 115 '<(PRODUCT_DIR)/content_browsertests.exe.pdb',
114 ], 116 ],
115 }, 117 },
116 }], 118 }],
117 ], 119 ],
118 'includes': [ 120 'includes': [
119 '../base/base.isolate', 121 '../base/base.isolate',
120 ], 122 ],
121 } 123 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698