Add swarm_client as an untracked dependency in all isolate files.

That way we don't need to update *.isolate files whenever dependency set of
run_test_cases.py changes. It's a necessary step before splitting run_isolated.py
into submodules.

BUG=276743

Review URL: https://chromiumcodereview.appspot.com/23093009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218844 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 12 insertions, 16 deletions

diff --git a/base/base_unittests.isolate b/base/base_unittests.isolate
index 852997b..0b140dd 100644
--- a/base/base_unittests.isolate
+++ b/base/base_unittests.isolate
@@ -29,10 +29,11 @@
       'variables': {
         'isolate_dependency_tracked': [
           '../testing/test_env.py',
-          '../tools/swarm_client/run_isolated.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
         ],
+        'isolate_dependency_untracked': [
+          '../tools/swarm_client/',
+        ],
       },
     }],
     ['OS=="mac" or OS=="win"', {
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
index 79ffdc0..1842deb 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -44,8 +44,6 @@
           '../media/test/data/sfx.ogg',
           '../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',
@@ -73,6 +71,7 @@
           '../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/',
diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate
index 554fdd0..130a810 100644
--- a/chrome/interactive_ui_tests.isolate
+++ b/chrome/interactive_ui_tests.isolate
@@ -32,8 +32,6 @@
           '../net/tools/testserver/testserver.py',
           '../net/tools/testserver/testserver_base.py',
           '../testing/test_env.py',
-          '../tools/swarm_client/run_isolated.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/resources.pak',
         ],
@@ -41,6 +39,7 @@
           '../third_party/pyftpdlib/',
           '../third_party/pywebsocket/src/mod_pywebsocket/',
           '../third_party/tlslite/tlslite/',
+          '../tools/swarm_client/',
           'test/data/',
         ],
       },
diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate
index 30fd0a5..99f4b75 100644
--- a/chrome/sync_integration_tests.isolate
+++ b/chrome/sync_integration_tests.isolate
@@ -44,11 +44,8 @@
     }],
     ['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/',
         ],
       },
diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
index 59b789d..59c160a 100644
--- a/chrome/unit_tests.isolate
+++ b/chrome/unit_tests.isolate
@@ -62,8 +62,6 @@
       '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',
         ],
@@ -72,6 +70,7 @@
           '../third_party/pyftpdlib/',
           '../third_party/pywebsocket/',
           '../third_party/tlslite/',
+          '../tools/swarm_client/',
           '<(PRODUCT_DIR)/pyproto/',
         ],
       },
diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate
index 55b0f56..7312750 100644
--- a/content/content_browsertests.isolate
+++ b/content/content_browsertests.isolate
@@ -45,8 +45,6 @@
       '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': [
@@ -56,6 +54,7 @@
           '../third_party/pyftpdlib/',
           '../third_party/pywebsocket/',
           '../third_party/tlslite/',
+          '../tools/swarm_client/',
         ],
       },
     }],
diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate
index 94e3863..b39101c 100644
--- a/content/content_unittests.isolate
+++ b/content/content_unittests.isolate
@@ -40,6 +40,9 @@
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
         ],
+        'isolate_dependency_untracked': [
+          '../tools/swarm_client/',
+        ],
       },
     }],
     ['OS=="mac"', {
diff --git a/net/net_unittests.isolate b/net/net_unittests.isolate
index 71a2dc0..9c88f77 100644
--- a/net/net_unittests.isolate
+++ b/net/net_unittests.isolate
@@ -34,14 +34,13 @@
       'variables': {
         'isolate_dependency_tracked': [
           '../testing/test_env.py',
-          '../tools/swarm_client/run_isolated.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
           '../third_party/pyftpdlib/',
           '../third_party/pywebsocket/',
           '../third_party/tlslite/',
+          '../tools/swarm_client/',
           '<(PRODUCT_DIR)/pyproto/',
           'tools/testserver/',
         ],