Skip to content

Commit 4c7bb12

Browse files
committed
patch 7.4.997
Problem: "make shadow" was sometimes broken. Solution: Add a test for it. (James McCoy, closes #520)
1 parent 256972a commit 4c7bb12

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.travis.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ compiler:
55
- gcc
66

77
env:
8-
- COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge
8+
- 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=
11-
- COVERAGE=no FEATURES=tiny CONFOPT=
10+
- COVERAGE=no FEATURES=small CONFOPT= SHADOWOPT= SRCDIR=./src
11+
- COVERAGE=no FEATURES=tiny CONFOPT= SHADOWOPT= SRCDIR=./src
1212

1313
sudo: false
1414

@@ -31,11 +31,11 @@ before_install:
3131

3232
script:
3333
- NPROC=$(getconf _NPROCESSORS_ONLN)
34-
- ./configure --with-features=$FEATURES $CONFOPT --enable-fail-if-missing && make -j$NPROC
35-
- ./src/vim --version
36-
- make test
34+
- if [ "x$SHADOWOPT" != x ]; then make -C src shadow; fi && (cd ${SRCDIR} && ./configure --with-features=$FEATURES $CONFOPT --enable-fail-if-missing && make -j$NPROC)
35+
- ${SRCDIR}/vim --version
36+
- make $SHADOWOPT test
3737

3838
after_success:
39-
- if [ x"$COVERAGE" = "xyes" ]; then ~/.local/bin/coveralls -b src -x .xs -e src/xxd -e src/if_perl.c --encodings utf-8 latin-1 EUC-KR; fi
39+
- if [ x"$COVERAGE" = "xyes" ]; then ~/.local/bin/coveralls -b $SRCDIR -x .xs -e ${SRCDIR}/xxd -e ${SRCDIR}/if_perl.c --encodings utf-8 latin-1 EUC-KR; fi
4040

4141
# vim:set sts=2 sw=2 tw=0 et:

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+
997,
744746
/**/
745747
996,
746748
/**/

0 commit comments

Comments
 (0)