diff options
author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-14 13:23:29 +0000 |
---|---|---|
committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-14 13:23:29 +0000 |
commit | 718e3f31202a91f1301f9b500363d4e69768b6ee (patch) | |
tree | 0b0de59e3a4c0b1a4aa1f19c2425c2c331b70126 /build | |
parent | ad3b6e847b32b3c0733e74124f716b73da8865b7 (diff) | |
download | chromium_src-718e3f31202a91f1301f9b500363d4e69768b6ee.zip chromium_src-718e3f31202a91f1301f9b500363d4e69768b6ee.tar.gz chromium_src-718e3f31202a91f1301f9b500363d4e69768b6ee.tar.bz2 |
Revert r217535 "Move swarm_client to swarming_client."
The CL itself is fine but the Try Server didn't gather
"got_swarming_client_revision" build property correctly, causing swarm_triggered
to use an improper swarm_client checkout. r217535 can be reapplied once the TS
is fixed. No other issue was observed.
TBR=vadimsh@chromium.org
BUG=
Review URL: https://codereview.chromium.org/22978003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r-- | build/android/pylib/gtest/setup.py | 2 | ||||
-rw-r--r-- | build/common.gypi | 2 | ||||
-rw-r--r-- | build/isolate.gypi | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py index 4da3bd0..2e70dd0 100644 --- a/build/android/pylib/gtest/setup.py +++ b/build/android/pylib/gtest/setup.py @@ -66,7 +66,7 @@ _DEPS_EXCLUSION_LIST = [ ] _ISOLATE_SCRIPT = os.path.join( - constants.DIR_SOURCE_ROOT, 'tools', 'swarming_client', 'isolate.py') + constants.DIR_SOURCE_ROOT, 'tools', 'swarm_client', 'isolate.py') def _GenerateDepsDirUsingIsolate(suite_name, build_type): diff --git a/build/common.gypi b/build/common.gypi index c0bbcca..e95efab 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -677,7 +677,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/swarming_client/isolate.py. See the script's + # target always calls tools/swarm_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/build/isolate.gypi b/build/isolate.gypi index 312cc48..15fcf4c 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -41,12 +41,12 @@ 'extension': 'isolate', 'inputs': [ # Files that are known to be involved in this step. - '<(DEPTH)/tools/swarming_client/isolate.py', - '<(DEPTH)/tools/swarming_client/isolateserver_archive.py', - '<(DEPTH)/tools/swarming_client/run_isolated.py', - '<(DEPTH)/tools/swarming_client/googletest/run_test_cases.py', - '<(DEPTH)/tools/swarming_client/short_expression_finder.py', - '<(DEPTH)/tools/swarming_client/trace_inputs.py', + '<(DEPTH)/tools/swarm_client/isolate.py', + '<(DEPTH)/tools/swarm_client/isolateserver_archive.py', + '<(DEPTH)/tools/swarm_client/run_isolated.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', # Disable file tracking by the build driver for now. This means the # project must have the proper build-time dependency for their runtime @@ -67,7 +67,7 @@ ["test_isolation_outdir==''", { 'action': [ 'python', - '<(DEPTH)/tools/swarming_client/isolate.py', + '<(DEPTH)/tools/swarm_client/isolate.py', '<(test_isolation_mode)', # GYP will eliminate duplicate arguments so '<(PRODUCT_DIR)' cannot # be provided twice. To work around this behavior, append '/'. @@ -87,7 +87,7 @@ }, { 'action': [ 'python', - '<(DEPTH)/tools/swarming_client/isolate.py', + '<(DEPTH)/tools/swarm_client/isolate.py', '<(test_isolation_mode)', '--outdir', '<(test_isolation_outdir)', # See comment above. |