Mercurial > vim
changeset 9544:8e797fc5ab0c v7.4.2052
commit https://github.com/vim/vim/commit/c3e539fa703b23d9a24c3520c96ec305ee932cb4
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jul 16 20:37:56 2016 +0200
patch 7.4.2052
Problem: Coverage report is messed up by the unittests.
Solution: Add a separate test target for script tests. Use that when
collecting coverage information.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 16 Jul 2016 20:45:09 +0200 |
| parents | 69b7bcb20b05 |
| children | 33d883608abb |
| files | .travis.yml src/Makefile src/version.c |
| diffstat | 3 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ script: - 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) - ${SRCDIR}/vim --version - - make $SHADOWOPT test + - make $SHADOWOPT scripttests 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
--- a/src/Makefile +++ b/src/Makefile @@ -1937,6 +1937,11 @@ types.vim: $(TAGS_SRC) $(TAGS_INCL) {printf("%s ", $$1)}END{print ""}' > $@ 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. # This doesn't depend on $(VIMTARGET), because that won't work when configure # 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 # get "TEST FAILURE". # -test check: +scripttests: $(MAKE) -f Makefile $(VIMTARGET) if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \ cd $(PODIR); $(MAKE) -f Makefile check VIM=../$(VIMTARGET); \ @@ -1957,7 +1962,7 @@ test check: ln -s $(VIMTARGET) vim; \ fi 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 testgui: @@ -1969,6 +1974,7 @@ benchmark: unittesttargets: $(MAKE) -f Makefile $(UNITTEST_TARGETS) +# Execute the unittests one by one. unittest unittests: $(UNITTEST_TARGETS) @for t in $(UNITTEST_TARGETS); do \ ./$$t || exit 1; echo $$t passed; \