diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 01:59:29 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 01:59:29 +0000 |
| commit | 256f4bd66fd000e2414495fc12c8d7a6152ab003 (patch) | |
| tree | 6a3454007015206edfd69f58e2fa3491c1fa0f73 /third_party/cacheinvalidation/cacheinvalidation.gyp | |
| parent | 5793906a89da44f153d3ec999544653fae5e58e1 (diff) | |
| download | chromium_src-256f4bd66fd000e2414495fc12c8d7a6152ab003.zip chromium_src-256f4bd66fd000e2414495fc12c8d7a6152ab003.tar.gz chromium_src-256f4bd66fd000e2414495fc12c8d7a6152ab003.tar.bz2 | |
Convert isolate.py to exclusively use .isolate files.
Convert base_unittests_run and net_unittests_run to use the new format.
Rename isolate_files to isolate_dependency_tracked and ..._dirs to ..._untracked.
Rewrite merge_isolate.py to have fully deterministic and sane behavior, especially for 'else' conditions.
Convert 'python' to sys.executable when running the command.
Add a lot of unit tests.
Move hashtable default directory into dirname(result) + '/hashtable'.
R=rogerta@chromium.org
R=mark@chromium.org
R=rsleevi@chromium.org
BUG=98834
TEST=
Review URL: http://codereview.chromium.org/10019014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/cacheinvalidation/cacheinvalidation.gyp')
| -rw-r--r-- | third_party/cacheinvalidation/cacheinvalidation.gyp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp index 95c9b09..af1905a 100644 --- a/third_party/cacheinvalidation/cacheinvalidation.gyp +++ b/third_party/cacheinvalidation/cacheinvalidation.gyp @@ -215,22 +215,28 @@ 'dependencies': [ 'cacheinvalidation_unittests', ], + 'includes': [ + 'cacheinvalidation_unittests.isolate', + ], 'actions': [ { 'action_name': 'isolate', 'inputs': [ - '<(PRODUCT_DIR)/cacheinvalidation_unittests<(EXECUTABLE_SUFFIX)', + 'cacheinvalidation_unittests.isolate', + '<@(isolate_dependency_tracked)', ], 'outputs': [ '<(PRODUCT_DIR)/cacheinvalidation_unittests.results', ], 'action': [ 'python', - '<(DEPTH)/tools/isolate/isolate.py', - '--mode=<(tests_run)', - '--root', '<(DEPTH)', + '../../tools/isolate/isolate.py', + '--mode', '<(tests_run)', + '--variable', 'DEPTH=<(DEPTH)', + '--variable', 'PRODUCT_DIR=<(PRODUCT_DIR)', + '--variable', 'OS=<(OS)', '--result', '<@(_outputs)', - '<@(_inputs)', + 'cacheinvalidation_unittests.isolate', ], }, ], |