diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-01-26 20:11:12 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-01-26 20:11:12 +0100 |
| commit | 1e07633a5d42f1756da88c25c3e7df957470acd9 (patch) | |
| tree | 55aeaab8e07d386effa6badf0cf951a2b3eae25c | |
| parent | 9e817c8a31232eda57963215eb16ee5b1ceefa7b (diff) | |
| download | vim-git-1e07633a5d42f1756da88c25c3e7df957470acd9.tar.gz | |
patch 8.0.0239: no CI with an address sanitizerv8.0.0239
Problem: The address sanitizer sometimes finds errors, but it needs to be
run manually.
Solution: Add an environment to Travis with clang and the address sanitizer.
(Christian Brabandt) Also include changes only on github.
| -rw-r--r-- | .travis.yml | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 543b033f6..73aac5a5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,13 +18,16 @@ env: # Mac OSX build - BUILD=yes TEST=test COVERAGE=no FEATURES=huge SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no "CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-rubyinterp --enable-luainterp'" + # ASAN build + - BUILD=yes TEST=test SANITIZER_CFLAGS="-g -O1 -fsanitize=address -fno-omit-frame-pointer" FEATURES=huge SRCDIR=./src CHECK_AUTOCONF=no + "CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-rubyinterp --enable-luainterp'" sudo: false git: depth: 1 -# instead of a 6*2*2 matrix (2*os + 2*compiler + 6*env), +# instead of a 2*2*8 matrix (2*os + 2*compiler + 8*env), # exclude some builds on mac os x and linux # linux: 2*compiler + 5*env + mac: 2*compiler + 2*env matrix: @@ -38,6 +41,13 @@ matrix: - os: osx env: BUILD=yes TEST=scripttests COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no "CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp'" + - os: osx + env: BUILD=yes TEST=test SANITIZER_CFLAGS="-g -O1 -fsanitize=address -fno-omit-frame-pointer" FEATURES=huge SRCDIR=./src CHECK_AUTOCONF=no + "CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-rubyinterp --enable-luainterp'" + - os: linux + compiler: gcc + env: BUILD=yes TEST=test SANITIZER_CFLAGS="-g -O1 -fsanitize=address -fno-omit-frame-pointer" FEATURES=huge SRCDIR=./src CHECK_AUTOCONF=no + "CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-rubyinterp --enable-luainterp'" - os: linux compiler: clang env: BUILD=no TEST=unittests COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=yes @@ -65,10 +75,8 @@ addons: - cscope before_install: - - if [ "$COVERAGE" = "yes" ]; then pip install --user cpp-coveralls; fi - # needed for https support for coveralls - # building cffi only works with gcc, not with clang - - if [ "$COVERAGE" = "yes" ]; then CC=gcc pip install --user pyopenssl ndg-httpsclient pyasn1; fi + - pip install --user cpp-coveralls + - pip install --user requests[security] # Lua is not installed on Travis OSX - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install lua; export LUA_PREFIX=/usr/local; fi diff --git a/src/version.c b/src/version.c index d89521600..36dbe3a54 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 239, +/**/ 238, /**/ 237, |