generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert 7327 "Update isolate.gypi files + link to isolate_driver.py"

Browse Source 
Breaks debug compilation (didn't run all trybots when testing this).

> Update isolate.gypi files + link to isolate_driver.py
> 
> This updates the isolate.gypi copies we're forced to
> maintain in our code repo to Chromium revision c264a05.
> 
> Since isolated testing is now using a new launch script
> in tools: isolate_driver.py, that is added to our links
> script.
> 
> BUG=395700
> TESTED=Ran one of our tests with:
> ninja -C out/Release tools_unittests_run
> tools/isolate_driver.py run --isolated out/Release/tools_unittests.isolated --isolate webrtc/tools/tools_unittests.isolate
> 
> R=henrika@webrtc.org, jam@chromium.org
> 
> Review URL: https://webrtc-codereview.appspot.com/26649004

TBR=kjellander@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/31509004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7328 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2014-09-30 08:44:00 +00:00
parent 02cd3067d2
commit 8cad9432d5
4 changed files with 22 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PRESUBMIT.py
View File

@ -186,7 +186,6 @@ def _CommonChecks(input_api, output_api):
r'^tools/clang/.*\.py$',
r'^tools/gn/.*\.py$',
r'^tools/gyp/.*\.py$',
r'^tools/isolate_driver.py$',
r'^tools/perf_expectations/.*\.py$',
r'^tools/protoc_wrapper/.*\.py$',
r'^tools/python/.*\.py$',

1
setup_links.py
View File

@ -85,7 +85,6 @@ if 'android' in get_target_os_list():
FILES = {
'.gn': None,
'tools/find_depot_tools.py': None,
'tools/isolate_driver.py': None,
'third_party/BUILD.gn': None,
}

34
talk/build/isolate.gypi
View File

@ -27,16 +27,15 @@
# Copied from Chromium's src/build/isolate.gypi
#
# It was necessary to copy this file because the path to build/common.gypi is
# different for the standalone and Chromium builds. Gyp doesn't permit
# conditional inclusion or variable expansion in include paths.
# It was necessary to copy this file to libjingle , because the path to
# build/common.gypi is different for the standalone and Chromium builds. Gyp
# doesn't permit conditional inclusion or variable expansion in include paths.
# http://code.google.com/p/gyp/wiki/InputFormatReference#Including_Other_Files
#
# Local modifications:
# * Removed include of '../chrome/version.gypi'.
# * Removed passing of version_full variable created in version.gypi:
# * Removal passing of version_full variable created in version.gypi:
# '--extra-variable', 'version_full=<(version_full)',
# * Removed condition for test_isolation_fail_on_missing == 0
# This file is meant to be included into a target to provide a rule
# to "build" .isolate files into a .isolated file.
@ -80,7 +79,6 @@
'extension': 'isolate',
'inputs': [
# Files that are known to be involved in this step.
'<(DEPTH)/tools/isolate_driver.py',
'<(DEPTH)/tools/swarming_client/isolate.py',
'<(DEPTH)/tools/swarming_client/run_isolated.py',
@ -96,12 +94,14 @@
# the switch-over to running tests on Swarm is completed.
#'<@(isolate_dependency_tracked)',
],
'outputs': [],
'outputs': [
'<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated',
],
'action': [
'python',
'<(DEPTH)/tools/isolate_driver.py',
'<(DEPTH)/tools/swarming_client/isolate.py',
'<(test_isolation_mode)',
'--isolated', '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated',
'--result', '<@(_outputs)',
'--isolate', '<(RULE_INPUT_PATH)',
# Variables should use the -V FOO=<(FOO) form so frequent values,
@ -117,20 +117,14 @@
'--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
'--config-variable', 'OS=<(OS)',
'--config-variable', 'CONFIGURATION_NAME=<(CONFIGURATION_NAME)',
'--config-variable', 'asan=<(asan)',
'--config-variable', 'chromeos=<(chromeos)',
'--config-variable', 'component=<(component)',
'--config-variable', 'fastbuild=<(fastbuild)',
# TODO(kbr): move this to chrome_tests.gypi:gles2_conform_tests_run
# once support for user-defined config variables is added.
'--config-variable',
'internal_gles2_conform_tests=<(internal_gles2_conform_tests)',
'--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)',
'--config-variable', 'libpeer_target_type=<(libpeer_target_type)',
'--config-variable', 'use_openssl=<(use_openssl)',
'--config-variable', 'target_arch=<(target_arch)',
'--config-variable', 'use_ozone=<(use_ozone)',
],
'conditions': [
# Note: When gyp merges lists, it appends them to the old value.
@ -144,14 +138,8 @@
["test_isolation_outdir!=''", {
'action': [ '--isolate-server', '<(test_isolation_outdir)' ],
}],
["test_isolation_mode == 'prepare'", {
'outputs': [
'<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated.gen.json',
],
}, {
'outputs': [
'<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated',
],
['test_isolation_fail_on_missing == 0', {
'action': ['--ignore_broken_items'],
}],
],
},

34
webrtc/build/isolate.gypi
View File

@ -8,16 +8,15 @@
# Copied from Chromium's src/build/isolate.gypi
#
# It was necessary to copy this file because the path to build/common.gypi is
# different for the standalone and Chromium builds. Gyp doesn't permit
# conditional inclusion or variable expansion in include paths.
# It was necessary to copy this file to WebRTC, because the path to
# build/common.gypi is different for the standalone and Chromium builds. Gyp
# doesn't permit conditional inclusion or variable expansion in include paths.
# http://code.google.com/p/gyp/wiki/InputFormatReference#Including_Other_Files
#
# Local modifications:
# * Removed include of '../chrome/version.gypi'.
# * Removed passing of version_full variable created in version.gypi:
# * Removal passing of version_full variable created in version.gypi:
# '--extra-variable', 'version_full=<(version_full)',
# * Removed condition for test_isolation_fail_on_missing == 0
# This file is meant to be included into a target to provide a rule
# to "build" .isolate files into a .isolated file.
@ -61,7 +60,6 @@
'extension': 'isolate',
'inputs': [
# Files that are known to be involved in this step.
'<(DEPTH)/tools/isolate_driver.py',
'<(DEPTH)/tools/swarming_client/isolate.py',
'<(DEPTH)/tools/swarming_client/run_isolated.py',
@ -77,12 +75,14 @@
# the switch-over to running tests on Swarm is completed.
#'<@(isolate_dependency_tracked)',
],
'outputs': [],
'outputs': [
'<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated',
],
'action': [
'python',
'<(DEPTH)/tools/isolate_driver.py',
'<(DEPTH)/tools/swarming_client/isolate.py',
'<(test_isolation_mode)',
'--isolated', '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated',
'--result', '<@(_outputs)',
'--isolate', '<(RULE_INPUT_PATH)',
# Variables should use the -V FOO=<(FOO) form so frequent values,
@ -98,20 +98,14 @@
'--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
'--config-variable', 'OS=<(OS)',
'--config-variable', 'CONFIGURATION_NAME=<(CONFIGURATION_NAME)',
'--config-variable', 'asan=<(asan)',
'--config-variable', 'chromeos=<(chromeos)',
'--config-variable', 'component=<(component)',
'--config-variable', 'fastbuild=<(fastbuild)',
# TODO(kbr): move this to chrome_tests.gypi:gles2_conform_tests_run
# once support for user-defined config variables is added.
'--config-variable',
'internal_gles2_conform_tests=<(internal_gles2_conform_tests)',
'--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)',
'--config-variable', 'libpeer_target_type=<(libpeer_target_type)',
'--config-variable', 'use_openssl=<(use_openssl)',
'--config-variable', 'target_arch=<(target_arch)',
'--config-variable', 'use_ozone=<(use_ozone)',
],
'conditions': [
# Note: When gyp merges lists, it appends them to the old value.
@ -125,14 +119,8 @@
["test_isolation_outdir!=''", {
'action': [ '--isolate-server', '<(test_isolation_outdir)' ],
}],
["test_isolation_mode == 'prepare'", {
'outputs': [
'<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated.gen.json',
],
}, {
'outputs': [
'<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated',
],
['test_isolation_fail_on_missing == 0', {
'action': ['--ignore_broken_items'],
}],
],
},