Chromium Code Reviews| Index: build/all.gyp |
| diff --git a/build/all.gyp b/build/all.gyp |
| index 00953bf3f6f8966b31ae3998d7944a8a24367c53..1e363fb8adc295c8422821f807950c7a06ec8bea 100644 |
| --- a/build/all.gyp |
| +++ b/build/all.gyp |
| @@ -315,19 +315,11 @@ |
| 'dependencies': [ |
| '../cc/blink/cc_blink_tests.gyp:cc_blink_unittests', |
| '../cc/cc_tests.gyp:cc_unittests', |
| - '../chrome/chrome.gyp:browser_tests', |
| - '../chrome/chrome.gyp:chromedriver_tests', |
| - '../chrome/chrome.gyp:chromedriver_unittests', |
| - '../chrome/chrome.gyp:interactive_ui_tests', |
| - '../chrome/chrome.gyp:sync_integration_tests', |
| - '../chrome/chrome.gyp:unit_tests', |
| '../cloud_print/cloud_print.gyp:cloud_print_unittests', |
| '../content/content_shell_and_tests.gyp:content_browsertests', |
| '../content/content_shell_and_tests.gyp:content_shell', |
| '../content/content_shell_and_tests.gyp:content_unittests', |
| '../device/device_tests.gyp:device_unittests', |
| - '../extensions/extensions_tests.gyp:extensions_browsertests', |
| - '../extensions/extensions_tests.gyp:extensions_unittests', |
| '../gin/gin.gyp:gin_unittests', |
| '../google_apis/google_apis.gyp:google_apis_unittests', |
| '../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support', |
| @@ -348,6 +340,18 @@ |
| '../tools/telemetry/telemetry.gyp:*', |
| ], |
| }], |
| + ['OS!="ios" and OS!="android" and chromecast==0', { |
| + 'dependencies': [ |
| + '../chrome/chrome.gyp:browser_tests', |
| + '../chrome/chrome.gyp:chromedriver_tests', |
| + '../chrome/chrome.gyp:chromedriver_unittests', |
| + '../chrome/chrome.gyp:interactive_ui_tests', |
| + '../chrome/chrome.gyp:sync_integration_tests', |
| + '../chrome/chrome.gyp:unit_tests', |
| + '../extensions/extensions_tests.gyp:extensions_browsertests', |
| + '../extensions/extensions_tests.gyp:extensions_unittests', |
| + ], |
| + }], |
| ['OS=="win"', { |
| 'dependencies': [ |
| '../chrome/chrome.gyp:app_installer', |
| @@ -416,7 +420,7 @@ |
| '../ui/message_center/message_center.gyp:*', |
| ], |
| }], |
| - ['test_isolation_mode != "noop"', { |
| + ['test_isolation_mode != "noop" and chromecast==0', { |
|
Nico
2015/03/31 16:27:19
Does chromecast not support running tests on swarm
gunsch
2015/03/31 16:34:41
chromium_swarm_tests shouldn't be the issue---but
|
| 'dependencies': [ |
| 'chromium_swarm_tests', |
| ], |
| @@ -436,6 +440,10 @@ |
| '../ui/app_list/app_list.gyp:app_list_unittests', |
| '../ui/aura/aura.gyp:aura_unittests', |
| '../ui/compositor/compositor.gyp:compositor_unittests', |
| + ], |
| + }], |
| + ['use_aura==1 and chromecast==0', { |
| + 'dependencies': [ |
| '../ui/keyboard/keyboard.gyp:keyboard_unittests', |
| '../ui/views/views.gyp:views_unittests', |
| ], |