diff options
author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-30 18:20:24 +0000 |
---|---|---|
committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-30 18:20:24 +0000 |
commit | 300cd5c4eeef24ab085a1f603b322daad19448ef (patch) | |
tree | d686da3ffc338d5395156b5e565637cdfa268f48 /build/isolate.gypi | |
parent | 0195d52cca3109df4568a413e00d4bdb4b8477bf (diff) | |
download | chromium_src-300cd5c4eeef24ab085a1f603b322daad19448ef.zip chromium_src-300cd5c4eeef24ab085a1f603b322daad19448ef.tar.gz chromium_src-300cd5c4eeef24ab085a1f603b322daad19448ef.tar.bz2 |
Roll swarming_client @ f9538eebbc82bdfed4768cde388c8ae8a1ac3209.
This split the commands 'archive' and 'hashtable'. Now only 'archive' is
supported with ninja. This command only supports --isolate-server, so change
isolate.gypi accordingly. Remove support for test_isolation_outdir=='', it
doesn't make sense.
$ git log b39e8cf08..f9538eebbc --date=short --format="%ad %ae %s" | sed 's/@chromium\.org//'
2014-01-30 maruel isolate.py: split commands hashtable and archive so each have different behavior
2014-01-24 kmg Default to env vars for swarming.py server URLs
2014-01-23 maruel Fix tools/run_swarm_tests_on_swarm.py to run at all.
2014-01-23 maruel No need for me in WATCHLISTS.
R=vadimsh@chromium.org
BUG=
Review URL: https://codereview.chromium.org/131503009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247999 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/isolate.gypi')
-rw-r--r-- | build/isolate.gypi | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/build/isolate.gypi b/build/isolate.gypi index b5980669..1079735 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -105,21 +105,12 @@ '--extra-variable', 'mac_product_name', '<(mac_product_name)', ], }], - ["test_isolation_outdir==''", { - # GYP will eliminate duplicate arguments so '<(PRODUCT_DIR)' cannot - # be provided twice. To work around this behavior, append '/'. - # - # Also have a space after <(PRODUCT_DIR) or visual studio will - # escape the argument wrappping " with the \ and merge it into - # the following arguments. - 'action': [ '--outdir', '<(PRODUCT_DIR)/ ' ], - }, { - 'action': [ '--outdir', '<(test_isolation_outdir)' ], + ["test_isolation_outdir!=''", { + 'action': [ '--isolate-server', '<(test_isolation_outdir)' ], }], ['test_isolation_fail_on_missing == 0', { - 'action': ['--ignore_broken_items'], - }, - ], + 'action': ['--ignore_broken_items'], + }], ], }, ], |