Skip to content

Commit 7b5f0a1

Browse files
committed
patch 7.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.
1 parent 6046197 commit 7b5f0a1

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

.travis.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ compiler:
77
env:
88
- COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT="-C src/shadow" SRCDIR=./src/shadow
99
"CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp'"
10-
- COVERAGE=no FEATURES=small CONFOPT= SHADOWOPT= SRCDIR=./src
11-
- COVERAGE=no FEATURES=tiny CONFOPT= SHADOWOPT= SRCDIR=./src
10+
CHECK_AUTOCONF=yes
11+
- COVERAGE=no FEATURES=normal CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
12+
- COVERAGE=no FEATURES=small CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
13+
- COVERAGE=no FEATURES=tiny CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
1214

1315
sudo: false
1416

@@ -19,6 +21,7 @@ branches:
1921
addons:
2022
apt:
2123
packages:
24+
- autoconf
2225
- lcov
2326
- libperl-dev
2427
- python-dev
@@ -31,6 +34,7 @@ before_install:
3134

3235
script:
3336
- NPROC=$(getconf _NPROCESSORS_ONLN)
37+
- if [ "$CHECK_AUTOCONF" = "yes" -a "$CC" = "gcc" ]; then make -C src autoconf; fi
3438
- if [ "x$SHADOWOPT" != x ]; then make -C src shadow; fi && (cd ${SRCDIR} && ./configure --with-features=$FEATURES $CONFOPT --enable-fail-if-missing && make -j$NPROC)
3539
- ${SRCDIR}/vim --version
3640
- make $SHADOWOPT test

src/version.c

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

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
1003,
744746
/**/
745747
1002,
746748
/**/

0 commit comments

Comments
 (0)