aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 7.4.2052

Browse Source 
Problem:    Coverage report is messed up by the unittests.
Solution:   Add a separate test target for script tests.  Use that when
            collecting coverage information.
This commit is contained in:
Bram Moolenaar
2016-07-16 20:37:56 +02:00
parent 502ae4ba63
commit c3e539fa70
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -37,7 +37,7 @@ script:
- if [ "$CHECK_AUTOCONF" = "yes" -a "$CC" = "gcc" ]; then make -C src autoconf; fi - 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) - 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 - ${SRCDIR}/vim --version
- make $SHADOWOPT test - make $SHADOWOPT scripttests
after_success: 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 [ 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

10
src/Makefile
View File

@@ -1937,6 +1937,11 @@ types.vim: $(TAGS_SRC) $(TAGS_INCL)
{printf("%s ", $$1)}END{print ""}' > $@ {printf("%s ", $$1)}END{print ""}' > $@
echo "syn keyword Constant OK FAIL TRUE FALSE MAYBE" >> $@ echo "syn keyword Constant OK FAIL TRUE FALSE MAYBE" >> $@
# TESTING
#
# Execute the test scripts and the unittests.
test check: scripttests unittests
# Execute the test scripts. Run these after compiling Vim, before installing. # Execute the test scripts. Run these after compiling Vim, before installing.
# This doesn't depend on $(VIMTARGET), because that won't work when configure # This doesn't depend on $(VIMTARGET), because that won't work when configure
# wasn't run yet. Restart make to build it instead. # wasn't run yet. Restart make to build it instead.
@@ -1948,7 +1953,7 @@ types.vim: $(TAGS_SRC) $(TAGS_INCL)
# If everything is alright, the final message will be "ALL DONE". If not you # If everything is alright, the final message will be "ALL DONE". If not you
# get "TEST FAILURE". # get "TEST FAILURE".
# #
test check: scripttests:
$(MAKE) -f Makefile $(VIMTARGET) $(MAKE) -f Makefile $(VIMTARGET)
if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \ if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
cd $(PODIR); $(MAKE) -f Makefile check VIM=../$(VIMTARGET); \ cd $(PODIR); $(MAKE) -f Makefile check VIM=../$(VIMTARGET); \
@@ -1957,7 +1962,7 @@ test check:
ln -s $(VIMTARGET) vim; \ ln -s $(VIMTARGET) vim; \
fi fi
cd testdir; $(MAKE) -f Makefile $(GUI_TESTTARGET) VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE) cd testdir; $(MAKE) -f Makefile $(GUI_TESTTARGET) VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
$(MAKE) -f Makefile unittest
# Run the tests with the GUI. Assumes vim/gvim was already built # Run the tests with the GUI. Assumes vim/gvim was already built
testgui: testgui:
@@ -1969,6 +1974,7 @@ benchmark:
unittesttargets: unittesttargets:
$(MAKE) -f Makefile $(UNITTEST_TARGETS) $(MAKE) -f Makefile $(UNITTEST_TARGETS)
# Execute the unittests one by one.
unittest unittests: $(UNITTEST_TARGETS) unittest unittests: $(UNITTEST_TARGETS)
@for t in $(UNITTEST_TARGETS); do \ @for t in $(UNITTEST_TARGETS); do \
./$$t || exit 1; echo $$t passed; \ ./$$t || exit 1; echo $$t passed; \

2
src/version.c
View File

@@ -758,6 +758,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 */
/**/
2052,
/**/ /**/
2051, 2051,
/**/ /**/