1
0
forked from aniani/vim

patch 7.4.997

Problem:    "make shadow" was sometimes broken.
Solution:   Add a test for it. (James McCoy, closes #520)
This commit is contained in:
Bram Moolenaar
2015-12-29 20:32:23 +01:00
parent 256972a984
commit 4c7bb12c82
2 changed files with 9 additions and 7 deletions

View File

@@ -5,10 +5,10 @@ compiler:
- gcc - gcc
env: env:
- COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge - 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'" "CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp'"
- COVERAGE=no FEATURES=small CONFOPT= - COVERAGE=no FEATURES=small CONFOPT= SHADOWOPT= SRCDIR=./src
- COVERAGE=no FEATURES=tiny CONFOPT= - COVERAGE=no FEATURES=tiny CONFOPT= SHADOWOPT= SRCDIR=./src
sudo: false sudo: false
@@ -31,11 +31,11 @@ before_install:
script: script:
- NPROC=$(getconf _NPROCESSORS_ONLN) - NPROC=$(getconf _NPROCESSORS_ONLN)
- ./configure --with-features=$FEATURES $CONFOPT --enable-fail-if-missing && make -j$NPROC - if [ "x$SHADOWOPT" != x ]; then make -C src shadow; fi && (cd ${SRCDIR} && ./configure --with-features=$FEATURES $CONFOPT --enable-fail-if-missing && make -j$NPROC)
- ./src/vim --version - ${SRCDIR}/vim --version
- make test - make $SHADOWOPT test
after_success: after_success:
- 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 - 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
# vim:set sts=2 sw=2 tw=0 et: # vim:set sts=2 sw=2 tw=0 et:

View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
997,
/**/ /**/
996, 996,
/**/ /**/