diff options
| author | Paweł Hajdan, Jr <phajdan.jr@chromium.org> | 2014-09-24 20:01:01 +0200 |
|---|---|---|
| committer | Paweł Hajdan, Jr <phajdan.jr@chromium.org> | 2014-09-24 18:02:55 +0000 |
| commit | 31d267935a2d604dd62b440ee8b36af1c762654c (patch) | |
| tree | cb7e343999ba0bb3a6693fffbeffb00cf6105551 | |
| parent | fef6d69e61888ebe0b4c763d47931b0dfbe7840f (diff) | |
| download | chromium_src-31d267935a2d604dd62b440ee8b36af1c762654c.zip chromium_src-31d267935a2d604dd62b440ee8b36af1c762654c.tar.gz chromium_src-31d267935a2d604dd62b440ee8b36af1c762654c.tar.bz2 | |
Make isolated tests work with asan
BUG=none
R=maruel@chromium.org, thakis@chromium.org
Review URL: https://codereview.chromium.org/596113002
Cr-Commit-Position: refs/heads/master@{#296462}
| -rw-r--r-- | base/base.isolate | 7 | ||||
| -rw-r--r-- | build/android/pylib/gtest/setup.py | 1 | ||||
| -rw-r--r-- | build/isolate.gypi | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/base/base.isolate b/base/base.isolate index c723284..03c45a1 100644 --- a/base/base.isolate +++ b/base/base.isolate @@ -9,6 +9,13 @@ '../third_party/icu/icu.isolate', ], 'conditions': [ + ['OS=="linux" and asan==1', { + 'variables': { + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/lib/libc++.so', + ], + }, + }], ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"', { 'variables': { 'isolate_dependency_tracked': [ diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py index 6868b86..fe152bf 100644 --- a/build/android/pylib/gtest/setup.py +++ b/build/android/pylib/gtest/setup.py @@ -113,6 +113,7 @@ def _GenerateDepsDirUsingIsolate(suite_name, isolate_file_path=None): '--config-variable', 'OS', 'android', '--config-variable', 'CONFIGURATION_NAME', constants.GetBuildType(), + '--config-variable', 'asan', '0', '--config-variable', 'chromeos', '0', '--config-variable', 'component', 'static_library', '--config-variable', 'fastbuild', '0', diff --git a/build/isolate.gypi b/build/isolate.gypi index 907fbb5..95d6926 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -89,6 +89,7 @@ '--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)', |