Mercurial > vim
changeset 9551:232b8642ec32
commit https://github.com/vim/vim/commit/87776a1ac12db3c800e87adcc08541cb609189a5
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jul 16 21:37:49 2016 +0200
Correct build condition.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 16 Jul 2016 21:45:05 +0200 |
| parents | 641e6f2f3392 |
| children | 49512aba8e32 |
| files | .travis.yml |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ compiler: env: - BUILD=yes TEST=scripttests COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT= SRCDIR=./src - - BUILD= TEST=unittests COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT= SRCDIR=./src + - BUILD=no TEST=unittests 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 - BUILD=yes TEST=test COVERAGE=no FEATURES=normal CONFOPT= SHADOWOPT="-C src/shadow" SRCDIR=./src/shadow CHECK_AUTOCONF=no @@ -37,11 +37,11 @@ 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 - - if [ "x$BUILD" = "yes" ]; then (cd ${SRCDIR} && ./configure --with-features=$FEATURES $CONFOPT --enable-fail-if-missing && make -j$NPROC); fi - - if [ "x$BUILD" = "yes" ]; then ${SRCDIR}/vim --version; fi + - (cd ${SRCDIR} && ./configure --with-features=$FEATURES $CONFOPT --enable-fail-if-missing && if [ "$BUILD" = "yes" ]; then make -j$NPROC; fi) + - if [ "$BUILD" = "yes" ]; then ${SRCDIR}/vim --version; fi - make $SHADOWOPT $TEST after_success: - - 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 + - if [ "$COVERAGE" = "yes" ]; 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: