Skip to content

Commit 1e07633

Browse files
committed
patch 8.0.0239: no CI with an address sanitizer
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.
1 parent 9e817c8 commit 1e07633

2 files changed

Lines changed: 15 additions & 5 deletions

File tree

.travis.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,16 @@ env:
1818
# Mac OSX build
1919
- BUILD=yes TEST=test COVERAGE=no FEATURES=huge SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
2020
"CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-rubyinterp --enable-luainterp'"
21+
# ASAN build
22+
- BUILD=yes TEST=test SANITIZER_CFLAGS="-g -O1 -fsanitize=address -fno-omit-frame-pointer" FEATURES=huge SRCDIR=./src CHECK_AUTOCONF=no
23+
"CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-rubyinterp --enable-luainterp'"
2124

2225
sudo: false
2326

2427
git:
2528
depth: 1
2629

27-
# instead of a 6*2*2 matrix (2*os + 2*compiler + 6*env),
30+
# instead of a 2*2*8 matrix (2*os + 2*compiler + 8*env),
2831
# exclude some builds on mac os x and linux
2932
# linux: 2*compiler + 5*env + mac: 2*compiler + 2*env
3033
matrix:
@@ -38,6 +41,13 @@ matrix:
3841
- os: osx
3942
env: BUILD=yes TEST=scripttests COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
4043
"CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp'"
44+
- os: osx
45+
env: BUILD=yes TEST=test SANITIZER_CFLAGS="-g -O1 -fsanitize=address -fno-omit-frame-pointer" FEATURES=huge SRCDIR=./src CHECK_AUTOCONF=no
46+
"CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-rubyinterp --enable-luainterp'"
47+
- os: linux
48+
compiler: gcc
49+
env: BUILD=yes TEST=test SANITIZER_CFLAGS="-g -O1 -fsanitize=address -fno-omit-frame-pointer" FEATURES=huge SRCDIR=./src CHECK_AUTOCONF=no
50+
"CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-rubyinterp --enable-luainterp'"
4151
- os: linux
4252
compiler: clang
4353
env: BUILD=no TEST=unittests COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=yes
@@ -65,10 +75,8 @@ addons:
6575
- cscope
6676

6777
before_install:
68-
- if [ "$COVERAGE" = "yes" ]; then pip install --user cpp-coveralls; fi
69-
# needed for https support for coveralls
70-
# building cffi only works with gcc, not with clang
71-
- if [ "$COVERAGE" = "yes" ]; then CC=gcc pip install --user pyopenssl ndg-httpsclient pyasn1; fi
78+
- pip install --user cpp-coveralls
79+
- pip install --user requests[security]
7280
# Lua is not installed on Travis OSX
7381
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install lua; export LUA_PREFIX=/usr/local; fi
7482

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
239,
767769
/**/
768770
238,
769771
/**/

0 commit comments

Comments
 (0)