diff options
| author | Mike Morris <mikemorris@users.noreply.github.com> | 2016-05-11 13:55:10 -0400 |
|---|---|---|
| committer | Mike Morris <mikemorris@users.noreply.github.com> | 2016-05-11 15:00:30 -0400 |
| commit | 3b20838762222d4a6461fbf9c721d653bf9f3e67 (patch) | |
| tree | d320825dc18986825ed6b6180af961ff9ccb9900 | |
| parent | cf05dc7a50b577a2965759620afa5fcbc93f726b (diff) | |
| download | qtlocation-mapboxgl-3b20838762222d4a6461fbf9c721d653bf9f3e67.tar.gz | |
[node] compile with -fsanitize=address
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | binding.gyp | 6 | ||||
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | platform/linux/scripts/configure.sh | 1 | ||||
| -rw-r--r-- | platform/osx/scripts/configure.sh | 1 |
5 files changed, 11 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 763852cb2a..47f6858f39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,11 +51,10 @@ matrix: sudo: false language: node compiler: ": node4-clang35-release" - env: BUILDTYPE=Release _CXX=clang++-3.5 _CC=clang-3.5 + env: BUILDTYPE=Release _CXX=clang++-3.5 _CC=clang-3.5 PATH=mason_packages/linux-x86_64/node_asan/4.4.4/bin:$PATH addons: *clang35 script: - - nvm install 4 - - nvm use 4 + - nvm use system - make node - make test-node after_script: diff --git a/binding.gyp b/binding.gyp index 10ed677ba3..1a889e8ae7 100644 --- a/binding.gyp +++ b/binding.gyp @@ -57,12 +57,17 @@ 'platform/default/jpeg_reader.cpp', ], + 'cflags': [ + '-fsanitize=address', + ], + 'cflags_cc': [ '<@(boost_cflags)', '<@(nunicode_cflags)', '<@(webp_cflags)', '<@(libpng_cflags)', '<@(libjpeg-turbo_cflags)', + '-fsanitize=address', ], 'link_settings': { @@ -75,6 +80,7 @@ '<@(libpng_static_libs)', '<@(libjpeg-turbo_ldflags)', '<@(libjpeg-turbo_static_libs)', + '-fsanitize=address', ], }, }] @@ -119,6 +119,7 @@ print_flags gtest static_libs cflags ldflags print_flags pixelmatch static_libs cflags ldflags print_flags webp static_libs cflags ldflags print_flags jni.hpp static_libs cflags ldflags +print_flags node_asan static_libs CONFIG+=" } } diff --git a/platform/linux/scripts/configure.sh b/platform/linux/scripts/configure.sh index 53dcaf5b1e..3040039ddd 100644 --- a/platform/linux/scripts/configure.sh +++ b/platform/linux/scripts/configure.sh @@ -16,6 +16,7 @@ RAPIDJSON_VERSION=1.0.2 GTEST_VERSION=1.7.0 PIXELMATCH_VERSION=0.9.0 WEBP_VERSION=0.5.0 +NODE_ASAN_VERSION=4.4.4 function print_opengl_flags { CONFIG+=" 'opengl_cflags%': $(quote_flags $(pkg-config gl x11 --cflags)),"$LN diff --git a/platform/osx/scripts/configure.sh b/platform/osx/scripts/configure.sh index a5f84d0ee2..113c4789aa 100644 --- a/platform/osx/scripts/configure.sh +++ b/platform/osx/scripts/configure.sh @@ -11,3 +11,4 @@ VARIANT_VERSION=1.1.0 RAPIDJSON_VERSION=1.0.2 GTEST_VERSION=1.7.0 PIXELMATCH_VERSION=0.9.0 +NODE_ASAN_VERSION=4.4.4 |