Mercurial > vim

changeset 11832:dbce4b707386 v8.0.0796

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0796: no coverage on Travis with clang commit https://github.com/vim/vim/commit/d973bcb483088b69eb1aed3788476662fe6b77ef Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jul 28 18:01:58 2017 +0200 patch 8.0.0796: no coverage on Travis with clang Problem: No coverage on Travis with clang. Solution: Use a specific coveralls version. (Ozaki Kiichi, closes https://github.com/vim/vim/issues/1888)
author Christian Brabandt <cb@256bit.org>
date Fri, 28 Jul 2017 18:15:04 +0200
parents 2454134c3a7a
children ffd6764d564e
files .travis.yml src/version.c
diffstat 2 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,6 @@ sudo: false
 # 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
-# Note: coverage currently does not work with clang, "setup.py install for cryptography" fails
 matrix:
   exclude:
     - os: osx
@@ -53,10 +52,6 @@ matrix:
             "CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-rubyinterp --enable-luainterp'"
     - os: linux
       compiler: clang
-      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: linux
-      compiler: clang
       env: BUILD=no TEST=unittests COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=yes
     - os: linux
       compiler: clang
@@ -82,7 +77,7 @@ addons:
       - cscope
 
 before_install:
-  - if [ "$COVERAGE" = "yes" ]; then pip install --user cpp-coveralls; fi
+  - if [ "$COVERAGE" = "yes" ]; then pip install --user cpp-coveralls==0.3.12; 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
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    796,
+/**/
     795,
 /**/
     794,