Add support for escaped target names in isolate driver.

tools/isolate_driver.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """Adaptor script called through build/isolate.gypi.
 
 Creates a wrapping .isolate which 'includes' the original one, that can be
 consumed by tools/swarming_client/isolate.py. Path variables are determined
 based on the current working directory. The relative_cwd in the .isolated file
 is determined based on the .isolate file that declare the 'command' variable to
 be used so the wrapping .isolate doesn't affect this value.
 
 This script loads build.ninja and processes it to determine all the executables
 referenced by the isolated target. It adds them in the wrapping .isolate file.
 
 WARNING: The target to use for build.ninja analysis is the base name of the
 .isolate file plus '_run'. For example, 'foo_test.isolate' would have the target
 'foo_test_run' analysed.
 """
 
 import glob
 import json
 import logging
 import os
 import posixpath
+import re
 import StringIO
 import subprocess
 import sys
 import time
 
 TOOLS_DIR = os.path.dirname(os.path.abspath(__file__))
 SWARMING_CLIENT_DIR = os.path.join(TOOLS_DIR, 'swarming_client')
 SRC_DIR = os.path.dirname(TOOLS_DIR)
 
 sys.path.insert(0, SWARMING_CLIENT_DIR)
@@ skipping 97 matching lines @@
   return item not in ('', '|', '||')
 
 
 def raw_build_to_deps(item):
   """Converts a raw ninja build statement into the list of interesting
   dependencies.
   """
   # TODO(maruel): Use a whitelist instead? .stamp, .so.TOC, .dylib.TOC,
   # .dll.lib, .exe and empty.
   # The first item is the build rule, e.g. 'link', 'cxx', 'phony', etc.
-  return filter(using_blacklist, item.split(' ')[1:])
+  # In ninja build files, spaces in targets are escaped with a $-prefix.
+  # Use a negative lookbehind to not split on a space that is following a $.

[M-A Ruel, 2015/05/04 13:39:52]

.. to not split on '$ '.
would be easier to read but I don't mind.

[nyquist, 2015/05/04 18:43:05]

Done.

+  return filter(using_blacklist, re.split('(?<!\$) ', item)[1:])
 
 
 def collect_deps(target, build_steps, dependencies_added, rules_seen):
   """Recursively adds all the interesting dependencies for |target|
   into |dependencies_added|.
   """
   if rules_seen is None:
     rules_seen = set()
   if target in rules_seen:
     # TODO(maruel): Figure out how it happens.
@@ skipping 148 matching lines @@
 
   swarming_client = os.path.join(SRC_DIR, 'tools', 'swarming_client')
   sys.stdout.flush()
   result = subprocess.call(
       [sys.executable, os.path.join(swarming_client, 'isolate.py')] + args)
   return result
 
 
 if __name__ == '__main__':
   sys.exit(main())