diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | base/base_unittests.isolate | 6 | ||||
| -rw-r--r-- | build/isolate.gypi | 2 | ||||
| -rw-r--r-- | chrome/browser_tests.isolate | 7 | ||||
| -rw-r--r-- | chrome/interactive_ui_tests.isolate | 10 | ||||
| -rw-r--r-- | chrome/sync_integration_tests.isolate | 9 | ||||
| -rw-r--r-- | chrome/unit_tests.isolate | 7 | ||||
| -rw-r--r-- | content/content_browsertests.isolate | 8 | ||||
| -rw-r--r-- | content/content_unittests.isolate | 4 | ||||
| -rw-r--r-- | net/net_unittests.isolate | 6 | ||||
| -rwxr-xr-x | tools/sharding_supervisor/sharding_supervisor.py | 3 |
11 files changed, 35 insertions, 29 deletions
@@ -43,7 +43,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarm_client # and whatever else without interference from each other. - "swarm_revision": "212588", + "swarm_revision": "213621", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling openssl # and whatever else without interference from each other. diff --git a/base/base_unittests.isolate b/base/base_unittests.isolate index 483d6f2..852997b 100644 --- a/base/base_unittests.isolate +++ b/base/base_unittests.isolate @@ -16,7 +16,7 @@ 'command': [ '../testing/xvfb.py', '<(PRODUCT_DIR)', - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -30,7 +30,7 @@ 'isolate_dependency_tracked': [ '../testing/test_env.py', '../tools/swarm_client/run_isolated.py', - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', ], }, @@ -39,7 +39,7 @@ 'variables': { 'command': [ '../testing/test_env.py', - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', ], }, diff --git a/build/isolate.gypi b/build/isolate.gypi index 7b81697..15fcf4c 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -44,7 +44,7 @@ '<(DEPTH)/tools/swarm_client/isolate.py', '<(DEPTH)/tools/swarm_client/isolateserver_archive.py', '<(DEPTH)/tools/swarm_client/run_isolated.py', - '<(DEPTH)/tools/swarm_client/run_test_cases.py', + '<(DEPTH)/tools/swarm_client/googletest/run_test_cases.py', '<(DEPTH)/tools/swarm_client/short_expression_finder.py', '<(DEPTH)/tools/swarm_client/trace_inputs.py', diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index 71bbb7b..9c9ad09 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -8,7 +8,7 @@ 'command': [ '../testing/xvfb.py', '<(PRODUCT_DIR)', - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '--use-less-jobs', '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', ], @@ -41,6 +41,8 @@ 'isolate_dependency_tracked': [ '../ppapi/tests/test_case.html', '../ppapi/tests/test_page.css', + '../tools/swarm_client/run_isolated.py', + '../tools/swarm_client/googletest/run_test_cases.py', '../testing/test_env.py', '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc.nmf', @@ -68,7 +70,6 @@ '../third_party/safe_browsing/', '../third_party/simplejson/', '../third_party/tlslite/', - '../tools/swarm_client/', '<(PRODUCT_DIR)/nacl_test_data/', '<(PRODUCT_DIR)/pnacl/', '<(PRODUCT_DIR)/pseudo_locales/', @@ -125,7 +126,7 @@ 'variables': { 'command': [ '../testing/test_env.py', - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '--use-less-jobs', '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', ], diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate index faaed83..554fdd0 100644 --- a/chrome/interactive_ui_tests.isolate +++ b/chrome/interactive_ui_tests.isolate @@ -8,7 +8,7 @@ 'command': [ '../testing/xvfb.py', '<(PRODUCT_DIR)', - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '-j1', '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)', ], @@ -33,8 +33,7 @@ '../net/tools/testserver/testserver_base.py', '../testing/test_env.py', '../tools/swarm_client/run_isolated.py', - '../tools/swarm_client/run_test_cases.py', - '../tools/swarm_client/third_party/upload.py', + '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/resources.pak', ], @@ -44,9 +43,6 @@ '../third_party/tlslite/tlslite/', 'test/data/', ], - 'isolate_dependency_touched': [ - '../tools/swarm_client/third_party/__init__.py', - ], }, }], ['OS=="linux" or OS=="win"', { @@ -73,7 +69,7 @@ 'variables': { 'command': [ '../testing/test_env.py', - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '-j1', '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)', ], diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate index 76cf74e..30fd0a5 100644 --- a/chrome/sync_integration_tests.isolate +++ b/chrome/sync_integration_tests.isolate @@ -8,7 +8,7 @@ 'command': [ '../testing/xvfb.py', '<(PRODUCT_DIR)', - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -44,8 +44,11 @@ }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { + 'isolate_dependency_tracked': [ + '../tools/swarm_client/run_isolated.py', + '../tools/swarm_client/googletest/run_test_cases.py', + ], 'isolate_dependency_untracked': [ - '../tools/swarm_client/', '<(PRODUCT_DIR)/pyproto/', ], }, @@ -53,7 +56,7 @@ ['OS=="mac"', { 'variables': { 'command': [ - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate index 96e982b..59b789d 100644 --- a/chrome/unit_tests.isolate +++ b/chrome/unit_tests.isolate @@ -44,7 +44,7 @@ 'command': [ '../testing/xvfb.py', '<(PRODUCT_DIR)', - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -62,6 +62,8 @@ 'variables': { 'isolate_dependency_tracked': [ '../testing/test_env.py', + '../tools/swarm_client/run_isolated.py', + '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)', 'browser/safe_browsing/two_phase_testserver.py', ], @@ -70,7 +72,6 @@ '../third_party/pyftpdlib/', '../third_party/pywebsocket/', '../third_party/tlslite/', - '../tools/swarm_client/', '<(PRODUCT_DIR)/pyproto/', ], }, @@ -89,7 +90,7 @@ 'variables': { 'command': [ '../testing/test_env.py', - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate index 4c31a24..55b0f56 100644 --- a/content/content_browsertests.isolate +++ b/content/content_browsertests.isolate @@ -26,10 +26,11 @@ 'command': [ '../testing/xvfb.py', '<(PRODUCT_DIR)', - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ + '../testing/xvfb.py', '<(PRODUCT_DIR)/content_shell.pak', '<(PRODUCT_DIR)/fonts.conf', '<(PRODUCT_DIR)/libclearkeycdm.so', @@ -43,6 +44,9 @@ ['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/googletest/run_test_cases.py', '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ @@ -73,7 +77,7 @@ 'variables': { 'command': [ '../testing/test_env.py', - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', ], }, diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate index a3bd8e8..9a9def4 100644 --- a/content/content_unittests.isolate +++ b/content/content_unittests.isolate @@ -27,7 +27,7 @@ 'command': [ '../testing/xvfb.py', '<(PRODUCT_DIR)', - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -56,7 +56,7 @@ 'variables': { 'command': [ '../testing/test_env.py', - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', ], }, diff --git a/net/net_unittests.isolate b/net/net_unittests.isolate index 06bd41b..71a2dc0 100644 --- a/net/net_unittests.isolate +++ b/net/net_unittests.isolate @@ -21,7 +21,7 @@ 'command': [ '../testing/xvfb.py', '<(PRODUCT_DIR)', - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -35,7 +35,7 @@ 'isolate_dependency_tracked': [ '../testing/test_env.py', '../tools/swarm_client/run_isolated.py', - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ @@ -51,7 +51,7 @@ 'variables': { 'command': [ '../testing/test_env.py', - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', ], }, diff --git a/tools/sharding_supervisor/sharding_supervisor.py b/tools/sharding_supervisor/sharding_supervisor.py index e18eae14..4bddeb2 100755 --- a/tools/sharding_supervisor/sharding_supervisor.py +++ b/tools/sharding_supervisor/sharding_supervisor.py @@ -60,7 +60,8 @@ def main(): parser.disable_interspersed_args() options, args = parser.parse_args() - swarm_client_dir = os.path.join(ROOT_DIR, 'tools', 'swarm_client') + swarm_client_dir = os.path.join( + ROOT_DIR, 'tools', 'swarm_client', 'googletest') sys.path.insert(0, swarm_client_dir) cmd = [ |