Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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': [ | |
| 6 '../base/base.isolate', | |
| 7 '../gin/v8.isolate', | |
| 8 ], | |
| 9 'conditions': [ | 5 'conditions': [ |
| 10 ['OS=="linux" or OS=="mac" or OS=="win"', { | |
| 11 'variables': { | |
| 12 'files': [ | |
| 13 'test/data/', | |
| 14 '../testing/test_env.py', | |
| 15 '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)', | |
| 16 '<(PRODUCT_DIR)/components_resources.pak', | |
| 17 '<(PRODUCT_DIR)/content_shell.pak', | |
| 18 ], | |
| 19 }, | |
| 20 }], | |
| 21 ['OS=="linux"', { | 6 ['OS=="linux"', { |
| 22 'variables': { | 7 'variables': { |
| 23 'command': [ | 8 'command': [ |
| 24 '../testing/xvfb.py', | 9 '../testing/xvfb.py', |
| 25 '<(PRODUCT_DIR)', | 10 '<(PRODUCT_DIR)', |
| 26 '<(PRODUCT_DIR)/components_browsertests', | 11 '<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)', |
| 27 '--brave-new-test-launcher', | 12 '--brave-new-test-launcher', |
| 28 '--test-launcher-bot-mode', | 13 '--test-launcher-bot-mode', |
| 29 '--asan=<(asan)', | 14 '--asan=<(asan)', |
| 30 '--lsan=<(lsan)', | 15 '--lsan=<(lsan)', |
| 31 ], | 16 ], |
| 32 'files': [ | 17 'files': [ |
| 33 '../testing/xvfb.py', | 18 '../testing/xvfb.py', |
| 34 '<(PRODUCT_DIR)/libosmesa.so', | 19 '<(PRODUCT_DIR)/libosmesa.so', |
| 35 ], | 20 ], |
| 36 }, | 21 }, |
| 37 }], | 22 }], |
| 38 ['OS=="linux" and use_ozone==0', { | 23 ['OS=="linux" and use_ozone==0', { |
| 39 'variables': { | 24 'variables': { |
| 40 'files': [ | 25 'files': [ |
| 41 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', | 26 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', |
| 42 ], | 27 ], |
| 43 }, | 28 }, |
| 44 }], | 29 }], |
| 45 ['OS=="mac" or OS=="win"', { | 30 ['OS=="mac" or OS=="win"', { |
| 46 'variables': { | 31 'variables': { |
| 47 'command': [ | 32 'command': [ |
| 48 '../testing/test_env.py', | 33 '../testing/test_env.py', |
| 49 '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)', | 34 '<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)', |
| 50 '--brave-new-test-launcher', | 35 '--brave-new-test-launcher', |
| 51 '--test-launcher-bot-mode', | 36 '--test-launcher-bot-mode', |
| 52 '--asan=<(asan)', | 37 '--asan=<(asan)', |
| 53 '--lsan=<(lsan)', | 38 '--lsan=<(lsan)', |
| 54 ], | 39 ], |
| 55 }, | 40 }, |
| 56 }], | 41 }], |
| 57 ['OS=="mac"', { | 42 ['OS=="linux" or OS=="mac" or OS=="win"', { |
|
M-A Ruel
2015/01/24 00:03:07
FYI, I generally prefer the conditions to be sorte
scottmg
2015/01/24 00:24:55
Better?
M-A Ruel
2015/01/24 00:37:37
Yes.
| |
| 58 'variables': { | 43 'variables': { |
| 59 'files': [ | 44 'files': [ |
| 60 '<(PRODUCT_DIR)/Content Shell.app/', | 45 '../net/data/', |
| 46 '../net/tools/testserver/', | |
| 47 '../testing/test_env.py', | |
| 48 '../third_party/pyftpdlib/', | |
| 49 '../third_party/pywebsocket/', | |
| 50 '../third_party/tlslite/', | |
| 51 '<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)', | |
| 52 '<(PRODUCT_DIR)/extensions_shell_and_test.pak', | |
| 53 'test/data/', | |
| 61 ], | 54 ], |
| 62 }, | 55 }, |
| 63 }], | 56 }], |
| 64 ], | 57 ], |
| 58 'includes': [ | |
| 59 '../base/base.isolate', | |
| 60 '../gin/v8.isolate', | |
| 61 ], | |
| 65 } | 62 } |
| OLD | NEW |