From 0b08038dc1753d2d417dfa040e63aef21ee8dce5 Mon Sep 17 00:00:00 2001 From: nyquist Date: Mon, 4 May 2015 23:08:29 -0700 Subject: Revert of Add support for escaped target names in isolate driver. (patchset #8 id:140001 of https://codereview.chromium.org/1103793002/) Reason for revert: Broke interactive_ui_tests and sync_integration_tests on Mac. See first breakage: http://build.chromium.org/p/chromium.mac/builders/Mac10.9%20Tests%20%28dbg%29/builds/5606 Possibly need to include the chrome.isolate in the isolates for browser_tests, and the two test suites mentioned above. Original issue's description: > Add support for escaped target names in isolate driver. > > Currently the isolate_driver.py which creates the dependency files > used by the isolate system, does a simple split on all spaces when > trying to identify targets. > > This can fail if the target name contains a space in the name. In > ninja, spaces are escaped with a $-prefix. An example would be > 'Content$ Shell$ Helper.app'. > > This CL adds support for such target names and ensures that they > stay as one item. Doing this uncovered a few missing dependencies > and a missing file in some .isolate-files for the component build > on Mac. > > Original CL: https://codereview.chromium.org/970203003 > > BUG=462248 > > Committed: https://crrev.com/86c49590cbae332dc933cd9ae3f67d240fb1f125 > Cr-Commit-Position: refs/heads/master@{#328236} TBR=vadimsh@chromium.org,thakis@chromium.org,maruel@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=462248 Review URL: https://codereview.chromium.org/1129493003 Cr-Commit-Position: refs/heads/master@{#328289} --- tools/isolate_driver.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'tools/isolate_driver.py') diff --git a/tools/isolate_driver.py b/tools/isolate_driver.py index f51b824..6c9f118 100755 --- a/tools/isolate_driver.py +++ b/tools/isolate_driver.py @@ -24,7 +24,6 @@ import json import logging import os import posixpath -import re import StringIO import subprocess import sys @@ -142,9 +141,7 @@ def raw_build_to_deps(item): # 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. - # In ninja build files, spaces in targets are escaped with a $-prefix. - # Use a negative lookbehind to not split on '$ '. - return filter(using_blacklist, re.split('(?