diff options
| -rw-r--r-- | base/base_unittests.isolate | 29 | ||||
| -rw-r--r-- | chrome/browser_tests.isolate | 87 | ||||
| -rw-r--r-- | chrome/sync_integration_tests.isolate | 43 | ||||
| -rw-r--r-- | chrome/unit_tests.isolate | 70 | ||||
| -rw-r--r-- | content/content_unittests.isolate | 37 | ||||
| -rw-r--r-- | net/net_unittests.isolate | 49 | ||||
| -rw-r--r-- | third_party/cacheinvalidation/cacheinvalidation_unittests.isolate | 20 |
7 files changed, 174 insertions, 161 deletions
diff --git a/base/base_unittests.isolate b/base/base_unittests.isolate index 039edd6..e3113b0 100644 --- a/base/base_unittests.isolate +++ b/base/base_unittests.isolate @@ -2,18 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. { - 'variables': { - 'isolate_dependency_tracked': [ - '../testing/test_env.py', - '../tools/swarm_client/run_isolated.py', - '../tools/swarm_client/run_test_cases.py', - '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_untracked': [ - 'data/', - 'prefs/test/', - ], - }, 'conditions': [ ['OS=="linux"', { 'variables': { @@ -28,7 +16,22 @@ '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, - }, { + }], + ['OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'isolate_dependency_tracked': [ + '../testing/test_env.py', + '../tools/swarm_client/run_isolated.py', + '../tools/swarm_client/run_test_cases.py', + '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', + ], + 'isolate_dependency_untracked': [ + 'data/', + 'prefs/test/', + ], + }, + }], + ['OS=="mac" or OS=="win"', { 'variables': { 'command': [ '../testing/test_env.py', diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index 1c260f4..efa91ed 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -3,47 +3,63 @@ # found in the LICENSE file. { 'conditions': [ + ['OS=="linux"', { + 'variables': { + 'command': [ + '../testing/xvfb.py', + '<(PRODUCT_DIR)', + '../tools/swarm_client/run_test_cases.py', + '--use-less-jobs', + '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', + ], + 'isolate_dependency_tracked': [ + '../testing/xvfb.py', + '<(PRODUCT_DIR)/DumpRenderTree<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/chrome.pak', + '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/libffmpegsumo.so', + '<(PRODUCT_DIR)/libosmesa.so', + '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so', + '<(PRODUCT_DIR)/libppapi_tests.so', + '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + 'browser/nacl_host/test/debug_stub_browser_tests.py', + 'browser/nacl_host/test/gdb_rsp.py', + ], + }, + }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'isolate_dependency_tracked': [ '../ppapi/tests/test_case.html', '../ppapi/tests/test_page.css', '../testing/test_env.py', - 'common/extensions/docs/examples/apps/calculator/app/model.js', '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/resources.pak', + 'common/extensions/docs/examples/apps/calculator/app/model.js', ], 'isolate_dependency_untracked': [ '../content/test/data/', '../net/data/', '../net/tools/testserver/', + '../third_party/WebKit/Tools/Scripts/', '../third_party/pyftpdlib/', '../third_party/pywebsocket/', '../third_party/tlslite/', - '../third_party/WebKit/Tools/Scripts/', '../tools/swarm_client/', - 'common/extensions/docs/examples/apps/calculator/tests/', - 'test/data/', - 'third_party/mock4js/', - '<(PRODUCT_DIR)/pyproto/', '<(PRODUCT_DIR)/nacl_test_data/', '<(PRODUCT_DIR)/pnacl/', '<(PRODUCT_DIR)/pseudo_locales/', + '<(PRODUCT_DIR)/pyproto/', '<(PRODUCT_DIR)/test_data/chrome/', + 'common/extensions/docs/examples/apps/calculator/tests/', + 'test/data/', + 'third_party/mock4js/', ], }, }], - ['OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '../testing/test_env.py', - '../tools/swarm_client/run_test_cases.py', - '--use-less-jobs', - '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ['OS=="win" or OS=="linux"', { + ['OS=="linux" or OS=="win"', { 'variables': { 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/chrome_100_percent.pak', @@ -67,7 +83,6 @@ 'common/extensions/docs/examples/apps/calculator/app/view.js', ], 'isolate_dependency_untracked': [ - '../net/data/websocket/', '../third_party/accessibility-developer-tools/gen/', '../third_party/bidichecker/', '../third_party/safe_browsing/', @@ -79,32 +94,6 @@ ], }, }], - ['OS=="linux"', { - 'variables': { - 'command': [ - '../testing/xvfb.py', - '<(PRODUCT_DIR)', - '../tools/swarm_client/run_test_cases.py', - '--use-less-jobs', - '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_tracked': [ - '../testing/xvfb.py', - '<(PRODUCT_DIR)/DumpRenderTree<(EXECUTABLE_SUFFIX)', - '<(PRODUCT_DIR)/chrome.pak', - '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)', - '<(PRODUCT_DIR)/libffmpegsumo.so', - '<(PRODUCT_DIR)/libosmesa.so', - '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so', - '<(PRODUCT_DIR)/libppapi_tests.so', - '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)', - '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', - 'browser/nacl_host/test/debug_stub_browser_tests.py', - 'browser/nacl_host/test/gdb_rsp.py', - ], - }, - }], ['OS=="mac"', { 'variables': { 'isolate_dependency_tracked': [ @@ -121,6 +110,16 @@ ], }, }], + ['OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '../testing/test_env.py', + '../tools/swarm_client/run_test_cases.py', + '--use-less-jobs', + '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', + ], + }, + }], ['OS=="win"', { 'variables': { 'isolate_dependency_tracked': [ diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate index 83b8ca1..76cf74e 100644 --- a/chrome/sync_integration_tests.isolate +++ b/chrome/sync_integration_tests.isolate @@ -2,14 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. { - 'variables': { - 'isolate_dependency_tracked': [ - ], - 'isolate_dependency_untracked': [ - '../tools/swarm_client/', - '<(PRODUCT_DIR)/pyproto/', - ], - }, 'conditions': [ ['OS=="linux"', { 'variables': { @@ -37,34 +29,39 @@ ], }, }], - ['OS=="mac"', { + ['OS=="linux" or OS=="mac"', { 'variables': { - 'command': [ - '../tools/swarm_client/run_test_cases.py', - '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)', - ], 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/ffmpegsumo.so', + '<(PRODUCT_DIR)/resources.pak', + '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '<(PRODUCT_DIR)/Chromium Framework.framework/', - '<(PRODUCT_DIR)/Chromium.app/', + '../third_party/pyftpdlib/', + '../third_party/pywebsocket/', + '../third_party/tlslite/', ], }, }], - ['OS=="win"', { + ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { + 'isolate_dependency_untracked': [ + '../tools/swarm_client/', + '<(PRODUCT_DIR)/pyproto/', + ], }, - }, { + }], + ['OS=="mac"', { 'variables': { - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/resources.pak', + 'command': [ + '../tools/swarm_client/run_test_cases.py', '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)', ], + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/ffmpegsumo.so', + ], 'isolate_dependency_untracked': [ - '../third_party/pyftpdlib/', - '../third_party/pywebsocket/', - '../third_party/tlslite/', + '<(PRODUCT_DIR)/Chromium Framework.framework/', + '<(PRODUCT_DIR)/Chromium.app/', ], }, }], diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate index 4f5d740..fdfd232 100644 --- a/chrome/unit_tests.isolate +++ b/chrome/unit_tests.isolate @@ -2,28 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. { - 'variables': { - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/resources.pak', - '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)', - 'browser/safe_browsing/two_phase_testserver.py', - ], - 'isolate_dependency_untracked': [ - '../base/prefs/test/data/', - '../extensions/test/data/', - '../net/data/', - '../net/tools/testserver/', - '../testing/test_env.py', - '../third_party/hunspell_dictionaries/', - '../third_party/pyftpdlib/', - '../third_party/pywebsocket/', - '../third_party/tlslite/', - '../tools/swarm_client/', - 'third_party/mock4js/', - 'test/data/', - '<(PRODUCT_DIR)/pyproto/', - ], - }, 'conditions': [ ['OS=="linux"', { 'variables': { @@ -47,16 +25,39 @@ '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so', ], }, - }, { + }], + ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'command': [ - '../testing/test_env.py', - '../tools/swarm_client/run_test_cases.py', + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/resources.pak', '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)', + 'browser/safe_browsing/two_phase_testserver.py', ], 'isolate_dependency_untracked': [ - '<(PRODUCT_DIR)/test_data/chrome/browser/resources/print_preview/', - '<(PRODUCT_DIR)/test_data/chrome/test/data/unit/', + '../base/prefs/test/data/', + '../extensions/test/data/', + '../net/data/', + '../net/tools/testserver/', + '../testing/test_env.py', + '../third_party/hunspell_dictionaries/', + '../third_party/pyftpdlib/', + '../third_party/pywebsocket/', + '../third_party/tlslite/', + '../tools/swarm_client/', + '<(PRODUCT_DIR)/pyproto/', + 'test/data/', + 'third_party/mock4js/', + ], + }, + }], + ['OS=="linux" or OS=="win"', { + 'variables': { + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/chrome_100_percent.pak', + '<(PRODUCT_DIR)/locales/en-US.pak', + ], + 'isolate_dependency_untracked': [ + '../third_party/accessibility-developer-tools/gen/', ], }, }], @@ -69,14 +70,17 @@ '<(PRODUCT_DIR)/Chromium Framework.framework/', ], }, - }, { + }], + ['OS=="mac" or OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/chrome_100_percent.pak', - '<(PRODUCT_DIR)/locales/en-US.pak', + 'command': [ + '../testing/test_env.py', + '../tools/swarm_client/run_test_cases.py', + '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ - '../third_party/accessibility-developer-tools/gen/', + '<(PRODUCT_DIR)/test_data/chrome/browser/resources/print_preview/', + '<(PRODUCT_DIR)/test_data/chrome/test/data/unit/', ], }, }], diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate index 0038388..efcd163 100644 --- a/content/content_unittests.isolate +++ b/content/content_unittests.isolate @@ -2,19 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. { - 'variables': { - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_untracked': [ - 'browser/gpu/gpu_driver_bug_list.json', - 'browser/gpu/gpu_switching_list.json', - 'browser/gpu/software_rendering_list.json', - 'test/data/', - '../third_party/hyphen/hyph_en_US.dic', - '../webkit/data/', - ], - }, 'conditions': [ ['OS=="linux"', { 'variables': { @@ -29,13 +16,20 @@ '<(PRODUCT_DIR)/test_data/', ], }, - }, { + }], + ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'command': [ - '../testing/test_env.py', - '../tools/swarm_client/run_test_cases.py', + 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', ], + 'isolate_dependency_untracked': [ + '../third_party/hyphen/hyph_en_US.dic', + '../webkit/data/', + 'browser/gpu/gpu_driver_bug_list.json', + 'browser/gpu/gpu_switching_list.json', + 'browser/gpu/software_rendering_list.json', + 'test/data/', + ], }, }], ['OS=="mac"', { @@ -46,6 +40,15 @@ ], }, }], + ['OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '../testing/test_env.py', + '../tools/swarm_client/run_test_cases.py', + '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', + ], + }, + }], ['OS=="win"', { 'variables': { 'isolate_dependency_untracked': [ diff --git a/net/net_unittests.isolate b/net/net_unittests.isolate index 62799cb..a54c3f4 100644 --- a/net/net_unittests.isolate +++ b/net/net_unittests.isolate @@ -2,26 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. { - 'variables': { - 'isolate_dependency_tracked': [ - '../chrome/test/data/animate1.gif', - '../chrome/test/data/server-unavailable.html', - '../chrome/test/data/server-unavailable.html.mock-http-headers', - '../chrome/test/data/simple.html', - '../testing/test_env.py', - '../tools/swarm_client/run_isolated.py', - '../tools/swarm_client/run_test_cases.py', - '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_untracked': [ - '../third_party/pywebsocket/', - '../third_party/tlslite/', - '../third_party/pyftpdlib/', - 'data/', - 'tools/testserver/', - '<(PRODUCT_DIR)/pyproto/', - ], - }, 'conditions': [ ['OS=="linux"', { 'variables': { @@ -36,7 +16,30 @@ '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, - }, { + }], + ['OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'isolate_dependency_tracked': [ + '../chrome/test/data/animate1.gif', + '../chrome/test/data/server-unavailable.html', + '../chrome/test/data/server-unavailable.html.mock-http-headers', + '../chrome/test/data/simple.html', + '../testing/test_env.py', + '../tools/swarm_client/run_isolated.py', + '../tools/swarm_client/run_test_cases.py', + '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', + ], + 'isolate_dependency_untracked': [ + '../third_party/pyftpdlib/', + '../third_party/pywebsocket/', + '../third_party/tlslite/', + '<(PRODUCT_DIR)/pyproto/', + 'data/', + 'tools/testserver/', + ], + }, + }], + ['OS=="mac" or OS=="win"', { 'variables': { 'command': [ '../testing/test_env.py', @@ -48,10 +51,10 @@ ['OS=="win"', { 'variables': { 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/icudt.dll', + '<(PRODUCT_DIR)/icudt.dll', ], 'isolate_dependency_untracked': [ - '../third_party/python_26/', + '../third_party/python_26/', ], }, }], diff --git a/third_party/cacheinvalidation/cacheinvalidation_unittests.isolate b/third_party/cacheinvalidation/cacheinvalidation_unittests.isolate index c9b7034..370b783 100644 --- a/third_party/cacheinvalidation/cacheinvalidation_unittests.isolate +++ b/third_party/cacheinvalidation/cacheinvalidation_unittests.isolate @@ -2,12 +2,16 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. { - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/cacheinvalidation_unittests<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/cacheinvalidation_unittests<(EXECUTABLE_SUFFIX)', - ], - }, + 'conditions': [ + ['OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '<(PRODUCT_DIR)/cacheinvalidation_unittests<(EXECUTABLE_SUFFIX)', + ], + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/cacheinvalidation_unittests<(EXECUTABLE_SUFFIX)', + ], + }, + }], + ], } |