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.
Files:      src/Makefile


*** ../vim-7.4.2051/src/Makefile        2016-07-16 19:49:54.372304144 +0200
--- src/Makefile        2016-07-16 20:37:15.759368119 +0200
***************
*** 1937,1942 ****
--- 1937,1947 ----
                        {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,1954 ****
  # If everything is alright, the final message will be "ALL DONE".  If not you
  # get "TEST FAILURE".
  #
! test check:
        $(MAKE) -f Makefile $(VIMTARGET)
        if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
                cd $(PODIR); $(MAKE) -f Makefile check VIM=../$(VIMTARGET); \
--- 1953,1959 ----
  # If everything is alright, the final message will be "ALL DONE".  If not you
  # get "TEST FAILURE".
  #
! scripttests:
        $(MAKE) -f Makefile $(VIMTARGET)
        if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
                cd $(PODIR); $(MAKE) -f Makefile check VIM=../$(VIMTARGET); \
***************
*** 1957,1963 ****
                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:
--- 1962,1968 ----
                ln -s $(VIMTARGET) vim; \
        fi
        cd testdir; $(MAKE) -f Makefile $(GUI_TESTTARGET) 
VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
! 
  
  # Run the tests with the GUI.  Assumes vim/gvim was already built
  testgui:
***************
*** 1969,1974 ****
--- 1974,1980 ----
  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; \
*** ../vim-7.4.2051/src/version.c       2016-07-16 19:49:54.376304103 +0200
--- src/version.c       2016-07-16 20:35:22.012526548 +0200
***************
*** 760,761 ****
--- 760,763 ----
  {   /* Add new patch number below this line */
+ /**/
+     2052,
  /**/

-- 
Not too long ago, unzipping in public was illegal...

 /// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Raspunde prin e-mail lui