diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-25 22:39:22 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-25 22:39:22 +0000 |
| commit | 1435f9f29acfd6ebcbc541144f85fd9da2bde925 (patch) | |
| tree | a2e94ae5ebd681854822787b5f972a0920212e60 /gyp | |
| parent | 50955db60509f351d2ef783f874a40346e12d2a2 (diff) | |
Add skia_tsan_build to match skia_asan_build and fix one example race.
R=mtklein@google.com
Review URL: https://codereview.chromium.org/24644003
git-svn-id: http://skia.googlecode.com/svn/trunk@11464 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 9 | ||||
| -rw-r--r-- | gyp/common_variables.gypi | 4 |
2 files changed, 12 insertions, 1 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index f9feb1c132..f8012b99d5 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -286,6 +286,15 @@ '-fsanitize=address', ], }], + [ 'skia_tsan_build', { + 'cflags': [ + '-fsanitize=thread', + '-fno-omit-frame-pointer', + ], + 'ldflags': [ + '-fsanitize=thread', + ], + }], [ 'skia_clang_build', { 'cflags': [ '-Wstring-conversion', diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 117ec9eedb..3f7b154b6f 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -79,6 +79,7 @@ ], 'skia_asan_build%': 0, + 'skia_tsan_build%': 0, 'skia_scalar%': 'float', 'skia_mesa%': 0, 'skia_nv_path_rendering%': 0, @@ -118,7 +119,7 @@ }, { 'skia_release_optimization_level%': '<(skia_default_gcc_optimization_level)', }], - [ 'skia_asan_build', { + [ 'skia_asan_build or skia_tsan_build', { 'skia_clang_build': 1, }, { 'skia_clang_build%': 0, @@ -133,6 +134,7 @@ 'skia_os%': '<(skia_os)', 'os_posix%': '<(os_posix)', 'skia_asan_build%': '<(skia_asan_build)', + 'skia_tsan_build%': '<(skia_tsan_build)', 'skia_scalar%': '<(skia_scalar)', 'skia_mesa%': '<(skia_mesa)', 'skia_nv_path_rendering%': '<(skia_nv_path_rendering)', |