Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 '../testing/test_env.py', | |
|
M-A Ruel
2014/09/27 01:11:08
testing/xvfb calls into test_env so it's unnecessa
jam
2014/09/27 18:54:51
ah, I didn't see that. verified that it works
| |
| 14 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', | 15 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', |
| 15 '--test-launcher-bot-mode', | 16 '--test-launcher-bot-mode', |
| 17 '--lsan=<(lsan)', | |
| 16 ], | 18 ], |
| 17 'isolate_dependency_tracked': [ | 19 'isolate_dependency_tracked': [ |
| 18 '../testing/xvfb.py', | 20 '../testing/xvfb.py', |
| 19 '<(PRODUCT_DIR)/libclearkeycdm.so', | 21 '<(PRODUCT_DIR)/libclearkeycdm.so', |
| 20 '<(PRODUCT_DIR)/libclearkeycdmadapter.so', | 22 '<(PRODUCT_DIR)/libclearkeycdmadapter.so', |
| 21 '<(PRODUCT_DIR)/libppapi_tests.so', | 23 '<(PRODUCT_DIR)/libppapi_tests.so', |
| 22 ], | 24 ], |
| 23 }, | 25 }, |
| 24 }], | 26 }], |
| 25 ['OS=="linux" and use_ozone==0', { | 27 ['OS=="linux" and use_ozone==0', { |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 178 '../ui/file_manager/file_manager/', | 180 '../ui/file_manager/file_manager/', |
| 179 '../ui/webui/resources/js/', | 181 '../ui/webui/resources/js/', |
| 180 '<(PRODUCT_DIR)/chromevox_test_data/', | 182 '<(PRODUCT_DIR)/chromevox_test_data/', |
| 181 '<(PRODUCT_DIR)/locales/', | 183 '<(PRODUCT_DIR)/locales/', |
| 182 '<(PRODUCT_DIR)/resources/chromeos/', | 184 '<(PRODUCT_DIR)/resources/chromeos/', |
| 183 ], | 185 ], |
| 184 }, | 186 }, |
| 185 }], | 187 }], |
| 186 ], | 188 ], |
| 187 } | 189 } |
| OLD | NEW |