diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-12-30 17:40:43 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-12-30 17:40:43 +0100 |
| commit | 7b5f0a15bce11754c47f849b2ddd68ba0909afac (patch) | |
| tree | 2c873ea721d65fd328dce9c46acde9fd808d9f8b | |
| parent | 604619784c7f9007a883c123231d080598bd49f5 (diff) | |
| download | vim-git-7.4.1003.tar.gz | |
patch 7.4.1003v7.4.1003
Problem: Travis could check a few more things.
Solution: Run autoconf on one of the builds. (James McCoy, closes #510)
Also build with normal features.
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index e6a12933f..fc6056863 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,10 @@ compiler: env: - COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT="-C src/shadow" SRCDIR=./src/shadow "CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp'" - - COVERAGE=no FEATURES=small CONFOPT= SHADOWOPT= SRCDIR=./src - - COVERAGE=no FEATURES=tiny CONFOPT= SHADOWOPT= SRCDIR=./src + CHECK_AUTOCONF=yes + - COVERAGE=no FEATURES=normal CONFOPT= SHADOWOPT= SRCDIR=./src 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 sudo: false @@ -19,6 +21,7 @@ branches: addons: apt: packages: + - autoconf - lcov - libperl-dev - python-dev @@ -31,6 +34,7 @@ before_install: script: - NPROC=$(getconf _NPROCESSORS_ONLN) + - if [ "$CHECK_AUTOCONF" = "yes" -a "$CC" = "gcc" ]; then make -C src autoconf; fi - if [ "x$SHADOWOPT" != x ]; then make -C src shadow; fi && (cd ${SRCDIR} && ./configure --with-features=$FEATURES $CONFOPT --enable-fail-if-missing && make -j$NPROC) - ${SRCDIR}/vim --version - make $SHADOWOPT test diff --git a/src/version.c b/src/version.c index 62271eda0..dc25a8254 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 */ /**/ + 1003, +/**/ 1002, /**/ 1001, |