diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 09:05:59 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 09:05:59 +0000 |
| commit | c9ea791495b2484dd1bdf85f8182ee3e1d916336 (patch) | |
| tree | 04c668e2c826332566bd1ae8089d98a459017ab0 /build/isolate.gypi | |
| parent | d2b8e0a77f525ecc5ca1805bf58a82fbe502803b (diff) | |
| download | chromium_src-c9ea791495b2484dd1bdf85f8182ee3e1d916336.zip chromium_src-c9ea791495b2484dd1bdf85f8182ee3e1d916336.tar.gz chromium_src-c9ea791495b2484dd1bdf85f8182ee3e1d916336.tar.bz2 | |
Add support for component=shared_library for base_unittests_run.
Specifically, this adds support to run base_unittests isolated
via 'isolate.py run' when built with component build.
This requires rolling icu @ 246118 to get the new icu.isolate.
R=thakis@chromium.org,jshin@chromium.org,frankf@chromium.org,rsleevi@chromium.org
BUG=336439
Review URL: https://codereview.chromium.org/132233030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/isolate.gypi')
| -rw-r--r-- | build/isolate.gypi | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/build/isolate.gypi b/build/isolate.gypi index 3d23655..b038a3f 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -69,20 +69,32 @@ 'python', '<(DEPTH)/tools/swarming_client/isolate.py', '<(test_isolation_mode)', + '--result', '<@(_outputs)', + '--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. - # This list needs to be kept in sync with the cmd line options - # in src/build/android/pylib/gtest/setup.py. + # like '0' or '1', aren't stripped out by GYP. Run 'isolate.py help' for + # more details. + # + # This list needs to be kept in sync with the cmd line options + # in src/build/android/pylib/gtest/setup.py. + + # Path variables are used to replace file paths when loading a .isolate + # file '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ', + + # Extra variables are replaced on the 'command' entry and on paths in + # the .isolate file but are not considered relative paths. + '--extra-variable', 'version_full=<(version_full)', + '--config-variable', 'OS=<(OS)', + '--config-variable', 'component=<(component)', # 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)', + 'internal_gles2_conform_tests=<(internal_gles2_conform_tests)', '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)', - '--extra-variable', 'version_full=<(version_full)', - '--result', '<@(_outputs)', - '--isolate', '<(RULE_INPUT_PATH)', + '--config-variable', 'use_openssl=<(use_openssl)', ], 'conditions': [ # Note: When gyp merges lists, it appends them to the old value. |