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

3 files changed, 27 insertions, 5 deletions

diff --git a/third_party/cacheinvalidation/README.chromium b/third_party/cacheinvalidation/README.chromium
index 5ddeb10..e54582d 100644
--- a/third_party/cacheinvalidation/README.chromium
+++ b/third_party/cacheinvalidation/README.chromium
@@ -8,3 +8,6 @@ Security Critical: no
 
 Description:
 This is the API to talk to the Google Cache Invalidation service.
+
+Local Modifications:
+None.
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',
           ],
         },
       ],
diff --git a/third_party/cacheinvalidation/cacheinvalidation_unittests.isolate b/third_party/cacheinvalidation/cacheinvalidation_unittests.isolate
new file mode 100644
index 0000000..c9b7034
--- /dev/null
+++ b/third_party/cacheinvalidation/cacheinvalidation_unittests.isolate
@@ -0,0 +1,13 @@
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+{
+  'variables': {
+    'command': [
+      '<(PRODUCT_DIR)/cacheinvalidation_unittests<(EXECUTABLE_SUFFIX)',
+    ],
+    'isolate_dependency_tracked': [
+      '<(PRODUCT_DIR)/cacheinvalidation_unittests<(EXECUTABLE_SUFFIX)',
+    ],
+  },
+}