File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -30,7 +30,6 @@ sudo: false
3030# instead of a 2*2*8 matrix (2*os + 2*compiler + 8*env),
3131# exclude some builds on mac os x and linux
3232# linux: 2*compiler + 5*env + mac: 2*compiler + 2*env
33- # Note: coverage currently does not work with clang, "setup.py install for cryptography" fails
3433matrix :
3534 exclude :
3635 - os : osx
@@ -51,10 +50,6 @@ matrix:
5150 env : BUILD=yes TEST=test SANITIZER_CFLAGS="-g -O1 -DABORT_ON_INTERNAL_ERROR -DEXITFREE -fsanitize=address -fno-omit-frame-pointer"
5251 FEATURES=huge SRCDIR=./src CHECK_AUTOCONF=no ASAN_OPTIONS="print_stacktrace=1 log_path=asan"
5352 " CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-rubyinterp --enable-luainterp'"
54- - os : linux
55- compiler : clang
56- env : BUILD=yes TEST=scripttests COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
57- " CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp'"
5853 - os : linux
5954 compiler : clang
6055 env : BUILD=no TEST=unittests COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=yes
@@ -82,7 +77,7 @@ addons:
8277 - cscope
8378
8479before_install :
85- - if [ "$COVERAGE" = "yes" ]; then pip install --user cpp-coveralls; fi
80+ - if [ "$COVERAGE" = "yes" ]; then pip install --user cpp-coveralls==0.3.12 ; fi
8681 # needed for https support for coveralls
8782 # building cffi only works with gcc, not with clang
8883 - if [ "$COVERAGE" = "yes" ]; then CC=gcc pip install --user pyopenssl ndg-httpsclient pyasn1; fi
Original file line number Diff line number Diff line change @@ -769,6 +769,8 @@ static char *(features[]) =
769769
770770static int included_patches [] =
771771{ /* Add new patch number below this line */
772+ /**/
773+ 796 ,
772774/**/
773775 795 ,
774776/**/
You can’t perform that action at this time.
0 commit comments