From 163f5517768c6b969a5abd9b39eb9c335206f133 Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Thu, 31 Oct 2013 13:34:31 +0000 Subject: [PATCH] Use swarming_client instead of swarm_client. Modify all the references to use src/tools/swarming_client/. The build scripts already support both. R=csharp@chromium.org, torne@chromium.org BUG= Review URL: https://codereview.chromium.org/29993003 git-svn-id: http://src.chromium.org/svn/trunk/src/build@232104 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- android/pylib/gtest/setup.py | 2 +- common.gypi | 2 +- isolate.gypi | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/pylib/gtest/setup.py b/android/pylib/gtest/setup.py index 4508d7ce7..da3dc66da 100644 --- a/android/pylib/gtest/setup.py +++ b/android/pylib/gtest/setup.py @@ -87,7 +87,7 @@ _DEPS_EXCLUSION_LIST = [ ] _ISOLATE_SCRIPT = os.path.join( - constants.DIR_SOURCE_ROOT, 'tools', 'swarm_client', 'isolate.py') + constants.DIR_SOURCE_ROOT, 'tools', 'swarming_client', 'isolate.py') def _GenerateDepsDirUsingIsolate(suite_name): diff --git a/common.gypi b/common.gypi index 869696bf9..873ee1764 100644 --- a/common.gypi +++ b/common.gypi @@ -698,7 +698,7 @@ # Whether tests targets should be run, archived or just have the # dependencies verified. All the tests targets have the '_run' suffix, # e.g. base_unittests_run runs the target base_unittests. The test - # target always calls tools/swarm_client/isolate.py. See the script's + # target always calls tools/swarming_client/isolate.py. See the script's # --help for more information and the valid --mode values. Meant to be # overriden with GYP_DEFINES. # TODO(maruel): Remove the conditions as more configurations are diff --git a/isolate.gypi b/isolate.gypi index 76882c786..0f3c84a00 100644 --- a/isolate.gypi +++ b/isolate.gypi @@ -41,9 +41,9 @@ 'extension': 'isolate', 'inputs': [ # Files that are known to be involved in this step. - '<(DEPTH)/tools/swarm_client/isolate.py', - '<(DEPTH)/tools/swarm_client/run_isolated.py', - '<(DEPTH)/tools/swarm_client/googletest/run_test_cases.py', + '<(DEPTH)/tools/swarming_client/isolate.py', + '<(DEPTH)/tools/swarming_client/run_isolated.py', + '<(DEPTH)/tools/swarming_client/googletest/run_test_cases.py', # Disable file tracking by the build driver for now. This means the # project must have the proper build-time dependency for their runtime @@ -64,7 +64,7 @@ ["test_isolation_outdir==''", { 'action': [ 'python', - '<(DEPTH)/tools/swarm_client/isolate.py', + '<(DEPTH)/tools/swarming_client/isolate.py', '<(test_isolation_mode)', # GYP will eliminate duplicate arguments so '<(PRODUCT_DIR)' cannot # be provided twice. To work around this behavior, append '/'. @@ -84,7 +84,7 @@ }, { 'action': [ 'python', - '<(DEPTH)/tools/swarm_client/isolate.py', + '<(DEPTH)/tools/swarming_client/isolate.py', '<(test_isolation_mode)', '--outdir', '<(test_isolation_outdir)', # See comment above.