Add --mode=noop so progress can be made while the builders are being reconfigured

R=rogerta@chromium.org
BUG=98636
TEST=committing r134507 again would work


Review URL: http://codereview.chromium.org/10261010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134580 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 13 insertions, 3 deletions

diff --git a/build/common.gypi b/build/common.gypi
index 2b1cd40..c98b473 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -322,7 +322,10 @@
       # always calls tools/isolate/isolate.py. See the script's --help for more
       # information and the valid --mode values. Meant to be overriden with
       # GYP_DEFINES.
-      'tests_run%': 'check',
+      # TODO(maruel): Converted the default from 'check' to 'noop' so work can
+      # be done while the builders are being reconfigured to check out test data
+      # files.
+      'tests_run%': 'noop',
 
        # Force rlz to use chrome's networking stack.
       'force_rlz_use_chrome_net%': 1,
diff --git a/tools/isolate/isolate.py b/tools/isolate/isolate.py
index 9605873..2c102c3 100755
--- a/tools/isolate/isolate.py
+++ b/tools/isolate/isolate.py
@@ -8,6 +8,7 @@
             --result and exits.
   hashtable Puts a manifest file and hard links each of the inputs into the
             output directory.
+  noop      Do nothing, used for transition purposes.
   remap     Stores all the inputs files in a directory without running the
             executable.
   run       Recreates a tree with all the inputs files and run the executable
@@ -518,7 +519,7 @@ def main():
     default_variables.append(('EXECUTABLE_SUFFIX', '.exe'))
   else:
     default_variables.append(('EXECUTABLE_SUFFIX', ''))
-  valid_modes = get_valid_modes()
+  valid_modes = get_valid_modes() + ['noop']
   parser = optparse.OptionParser(
       usage='%prog [options] [.isolate file]',
       description=sys.modules[__name__].__doc__)
@@ -563,6 +564,11 @@ def main():
     logging.debug('%s' % sys.argv)
     parser.error('Use only one argument which should be a .isolate file')
 
+  if options.mode == 'noop':
+    # This undocumented mode is to help transition since some builders do not
+    # have all the test data files checked out. Exit silently.
+    return 0
+
   root_dir, infiles, data = process_options(
       dict(options.variables), options.result, args[0], parser.error)
 
diff --git a/tools/isolate/isolate_smoke_test.py b/tools/isolate/isolate_smoke_test.py
index db62c63..f2e7f25 100755
--- a/tools/isolate/isolate_smoke_test.py
+++ b/tools/isolate/isolate_smoke_test.py
@@ -223,7 +223,8 @@ class Isolate(unittest.TestCase):
     out = out[:out.index('')]
     modes = [re.match(r'^  (\w+) .+', l) for l in out]
     modes = tuple(m.group(1) for m in modes if m)
-    self.assertEquals(EXPECTED_MODES, modes)
+    # noop doesn't do anything so no point in testing it.
+    self.assertEquals(sorted(EXPECTED_MODES + ('noop',)), sorted(modes))
 
   def test_modes(self):
     # This is a bit redundant but make sure all combinations are tested.