diff options
author | thakis <thakis@chromium.org> | 2015-05-10 09:38:33 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-10 16:39:11 +0000 |
commit | 3d06cd37c4d15cf75a396ec528fd362f18b2c066 (patch) | |
tree | c0fdf5f51454b7d79a07eeb348a7382ac1992445 | |
parent | 62a5bb3d60f9863666194da9446d467c69fe3280 (diff) | |
download | chromium_src-3d06cd37c4d15cf75a396ec528fd362f18b2c066.zip chromium_src-3d06cd37c4d15cf75a396ec528fd362f18b2c066.tar.gz chromium_src-3d06cd37c4d15cf75a396ec528fd362f18b2c066.tar.bz2 |
Revert of Add support for escaped target names in isolate driver (3rd try) (patchset #2 id:20001 of https://codereview.chromium.org/1130523003/)
Reason for revert:
Looks like interactive_ui_tests needs a dep on chrome too:
http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Linux/builds/40889/steps/compile/logs/stdio
FAILED: cd ../../chrome; python ../tools/isolate_driver.py check --isolated "../out/Release/interactive_ui_tests.isolated" --isolate "interactive_ui_tests.isolate" --path-variable DEPTH .. --path-variable PRODUCT_DIR "../out/Release " --extra-variable "version_full=44.0.2398.0" --config-variable "CONFIGURATION_NAME=Release" --config-variable "OS=linux" --config-variable "asan=0" --config-variable "branding=Chrome" --config-variable "chromeos=0" --config-variable "component=static_library" --config-variable "disable_nacl=0" --config-variable "enable_pepper_cdms=1" --config-variable "enable_plugins=1" --config-variable "fastbuild=0" --config-variable "icu_use_data_file_flag=1" --config-variable "internal_gles2_conform_tests=0" --config-variable "kasko=0" --config-variable "libpeer_target_type=static_library" --config-variable "lsan=0" --config-variable "msan=0" --config-variable "target_arch=ia32" --config-variable "tsan=0" --config-variable "use_custom_libcxx=0" --config-variable "use_instrumented_libraries=0" --config-variable "use_prebuilt_instrumented_libraries=0" --config-variable "use_openssl=0" --config-variable "use_ozone=0" --config-variable "use_x11=1" --config-variable "v8_use_external_startup_data=1"
Failed to find an input file: Input file /b/build/slave/google-chrome-rel-linux/build/src/out/Release/chrome doesn't exist
Reverting for now, but should be easy to fix.
Original issue's description:
> Add support for escaped target names in isolate driver (3rd try)
>
> 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.
>
> 1st try: https://codereview.chromium.org/970203003/
> 1st revert: https://codereview.chromium.org/985753002/
> 2nd try: https://codereview.chromium.org/1103793002/
> 2nd revert: https://codereview.chromium.org/1129493003/
> BUG=462248
>
> Committed: https://crrev.com/e94fb8bb82056ce3a255691a9326fd12707cf0cb
> Cr-Commit-Position: refs/heads/master@{#329038}
TBR=vadimsh@chromium.org,nyquist@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=462248
Review URL: https://codereview.chromium.org/1131363003
Cr-Commit-Position: refs/heads/master@{#329064}
-rw-r--r-- | chrome/chrome.isolate | 7 | ||||
-rw-r--r-- | chrome/chrome_tests.gypi | 3 | ||||
-rw-r--r-- | chrome/interactive_ui_tests.isolate | 1 | ||||
-rw-r--r-- | chrome/sync_integration_tests.isolate | 1 | ||||
-rwxr-xr-x | tools/isolate_driver.py | 5 |
5 files changed, 1 insertions, 16 deletions
diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate index c628c30..e4dd9ef 100644 --- a/chrome/chrome.isolate +++ b/chrome/chrome.isolate @@ -77,13 +77,6 @@ ], }, }], - ['OS=="mac" and component=="shared_library"', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/libchrome_main_dll.dylib', - ], - }, - }], ['OS=="mac" and asan==1 and fastbuild==0', { 'variables': { 'files': [ diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 9971155..7d0c082 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2758,9 +2758,6 @@ 'browser/sync/test/integration/single_client_dictionary_sync_test.cc', 'browser/sync/test/integration/two_client_dictionary_sync_test.cc', ], - 'dependencies': [ - 'chrome', - ], }], ['OS=="win"', { 'sources': [ diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate index 86cfe90..0e37609 100644 --- a/chrome/interactive_ui_tests.isolate +++ b/chrome/interactive_ui_tests.isolate @@ -145,6 +145,5 @@ 'includes': [ '../base/base.isolate', '../gin/v8.isolate', - 'chrome.isolate', ], } diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate index 0c01741..3ff1056 100644 --- a/chrome/sync_integration_tests.isolate +++ b/chrome/sync_integration_tests.isolate @@ -116,6 +116,5 @@ '../base/base.isolate', '../gin/v8.isolate', '../third_party/angle/angle.isolate', - 'chrome.isolate', ], } 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('(?<!\$) ', item)[1:]) + return filter(using_blacklist, item.split(' ')[1:]) def collect_deps(target, build_steps, dependencies_added, rules_seen): |