diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-03 23:06:34 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-03 23:06:34 +0100 |
| commit | 47707f6f34007dd803c75addbbd578fd37a74a92 (patch) | |
| tree | dd453b2a7a1df56414f8eb1415f0693bfeb3defb | |
| parent | 718272a7e13c71095ce07eb3b3d5e1f9790a6991 (diff) | |
| download | vim-git-47707f6f34007dd803c75addbbd578fd37a74a92.tar.gz | |
patch 7.4.1045v7.4.1045
Problem: Having shadow and coverage on the same build results in the source
files not being available in the coverage view.
Solution: Move using shadow to the normal build.
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index fc6056863..af3eb1f3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,10 @@ compiler: - gcc env: - - COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT="-C src/shadow" SRCDIR=./src/shadow + - COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT= SRCDIR=./src "CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp'" CHECK_AUTOCONF=yes - - COVERAGE=no FEATURES=normal CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no + - COVERAGE=no FEATURES=normal CONFOPT= SHADOWOPT="-C src/shadow" SRCDIR=./src/shadow CHECK_AUTOCONF=no - COVERAGE=no FEATURES=small CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no - COVERAGE=no FEATURES=tiny CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no diff --git a/src/version.c b/src/version.c index a007d0d39..86f50c33e 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1045, +/**/ 1044, /**/ 1043, |