d6d27e7340
This updates the isolate.gypi copies we have to maintain in our code repo to Chromium's revision 310ea93. The changes about generating .isolated.gen.json files are needed to support running with Swarming (https://www.chromium.org/developers/testing/isolated-testing) Since isolated testing is now using a new launch script in tools: isolate_driver.py, that's added to our links script. In order to use isolate_driver.py, the .isolate files must be in the same directory as the test_name_run target is defined, which meant I had to move around some of the isolate files and targets below webrtc/modules. BUG=497757 R=maruel@chromium.org TBR=henrik.lundin@webrtc.org, mflodman@webrtc.org, niklas.enbom@webrtc.org TESTED=Clobbered trybots: git cl try -c --bot=linux_compile_rel --bot=mac_compile_rel --bot=win_compile_rel --bot=android_compile_rel --bot=ios_rel -m tryserver.webrtc Review URL: https://codereview.webrtc.org/1373513002 . Cr-Commit-Position: refs/heads/master@{#10081}
144 lines
5.3 KiB
Python
144 lines
5.3 KiB
Python
# Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
|
|
#
|
|
# Use of this source code is governed by a BSD-style license
|
|
# that can be found in the LICENSE file in the root of the source
|
|
# tree. An additional intellectual property rights grant can be found
|
|
# in the file PATENTS. All contributing project authors may
|
|
# be found in the AUTHORS file in the root of the source tree.
|
|
|
|
# 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.
|
|
# 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:
|
|
# '--extra-variable', 'version_full=<(version_full)',
|
|
|
|
# This file is meant to be included into a target to provide a rule
|
|
# to "build" .isolate files into a .isolated file.
|
|
#
|
|
# To use this, create a gyp target with the following form:
|
|
# 'conditions': [
|
|
# ['test_isolation_mode != "noop"', {
|
|
# 'targets': [
|
|
# {
|
|
# 'target_name': 'foo_test_run',
|
|
# 'type': 'none',
|
|
# 'dependencies': [
|
|
# 'foo_test',
|
|
# ],
|
|
# 'includes': [
|
|
# '../build/isolate.gypi',
|
|
# 'foo_test.isolate',
|
|
# ],
|
|
# 'sources': [
|
|
# 'foo_test.isolate',
|
|
# ],
|
|
# },
|
|
# ],
|
|
# }],
|
|
# ],
|
|
#
|
|
# Note: foo_test.isolate is included and a source file. It is an inherent
|
|
# property of the .isolate format. This permits to define GYP variables but is
|
|
# a stricter format than GYP so isolate.py can read it.
|
|
#
|
|
# The generated .isolated file will be:
|
|
# <(PRODUCT_DIR)/foo_test.isolated
|
|
#
|
|
# See http://dev.chromium.org/developers/testing/isolated-testing/for-swes
|
|
# for more information.
|
|
|
|
{
|
|
'rules': [
|
|
{
|
|
'rule_name': 'isolate',
|
|
'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',
|
|
],
|
|
'outputs': [],
|
|
'action': [
|
|
'python',
|
|
'<(DEPTH)/tools/isolate_driver.py',
|
|
'<(test_isolation_mode)',
|
|
'--isolated', '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated',
|
|
'--isolate', '<(RULE_INPUT_PATH)',
|
|
|
|
# Variables should use the -V FOO=<(FOO) form so frequent values,
|
|
# like '0' or '1', aren't stripped out by GYP. Run 'isolate.py help' for
|
|
# more details.
|
|
|
|
# Path variables are used to replace file paths when loading a .isolate
|
|
# file
|
|
'--path-variable', 'DEPTH', '<(DEPTH)',
|
|
'--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
|
|
|
|
# Note: This list must match DefaultConfigVariables()
|
|
# in build/android/pylib/utils/isolator.py
|
|
'--config-variable', 'CONFIGURATION_NAME=<(CONFIGURATION_NAME)',
|
|
'--config-variable', 'OS=<(OS)',
|
|
'--config-variable', 'asan=<(asan)',
|
|
'--config-variable', 'branding=<(branding)',
|
|
'--config-variable', 'chromeos=<(chromeos)',
|
|
'--config-variable', 'component=<(component)',
|
|
'--config-variable', 'disable_nacl=<(disable_nacl)',
|
|
'--config-variable', 'enable_pepper_cdms=<(enable_pepper_cdms)',
|
|
'--config-variable', 'enable_plugins=<(enable_plugins)',
|
|
'--config-variable', 'fastbuild=<(fastbuild)',
|
|
'--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)',
|
|
# 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', 'kasko=<(kasko)',
|
|
'--config-variable', 'lsan=<(lsan)',
|
|
'--config-variable', 'msan=<(msan)',
|
|
'--config-variable', 'target_arch=<(target_arch)',
|
|
'--config-variable', 'tsan=<(tsan)',
|
|
'--config-variable', 'use_custom_libcxx=<(use_custom_libcxx)',
|
|
'--config-variable', 'use_instrumented_libraries=<(use_instrumented_libraries)',
|
|
'--config-variable',
|
|
'use_prebuilt_instrumented_libraries=<(use_prebuilt_instrumented_libraries)',
|
|
'--config-variable', 'use_openssl=<(use_openssl)',
|
|
'--config-variable', 'use_ozone=<(use_ozone)',
|
|
'--config-variable', 'use_x11=<(use_x11)',
|
|
'--config-variable', 'v8_use_external_startup_data=<(v8_use_external_startup_data)',
|
|
],
|
|
'conditions': [
|
|
# Note: When gyp merges lists, it appends them to the old value.
|
|
['OS=="mac"', {
|
|
'action': [
|
|
'--extra-variable', 'mac_product_name=<(mac_product_name)',
|
|
],
|
|
}],
|
|
["test_isolation_mode == 'prepare'", {
|
|
'outputs': [
|
|
'<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated.gen.json',
|
|
],
|
|
}, {
|
|
'outputs': [
|
|
'<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated',
|
|
],
|
|
}],
|
|
['OS=="win"', {
|
|
'action': [
|
|
'--config-variable', 'msvs_version=<(MSVS_VERSION)',
|
|
],
|
|
}, {
|
|
'action': [
|
|
'--config-variable', 'msvs_version=0',
|
|
],
|
|
}],
|
|
],
|
|
},
|
|
],
|
|
}
|