6f9cd2b
To: vim-dev@vim.org
6f9cd2b
Subject: Patch 7.2.015
6f9cd2b
Fcc: outbox
6f9cd2b
From: Bram Moolenaar <Bram@moolenaar.net>
6f9cd2b
Mime-Version: 1.0
6f9cd2b
Content-Type: text/plain; charset=ISO-8859-1
6f9cd2b
Content-Transfer-Encoding: 8bit
6f9cd2b
------------
6f9cd2b
6f9cd2b
Patch 7.2.015
6f9cd2b
Problem:    "make all test install" doesn't stop when the test fails. (Daniel
6f9cd2b
	    Shahaf)
6f9cd2b
Solution:   When test.log contains failures exit with non-zero status.
6f9cd2b
Files:	    src/testdir/Makefile
6f9cd2b
6f9cd2b
6f9cd2b
*** ../vim-7.2.014/src/testdir/Makefile	Wed Jun 25 00:22:53 2008
6f9cd2b
--- src/testdir/Makefile	Sun Sep  7 21:31:49 2008
6f9cd2b
***************
6f9cd2b
*** 26,40 ****
6f9cd2b
  
6f9cd2b
  .SUFFIXES: .in .out
6f9cd2b
  
6f9cd2b
! nongui:	nolog $(SCRIPTS)
6f9cd2b
! 	@echo
6f9cd2b
! 	@cat test.log
6f9cd2b
! 	@echo ALL DONE
6f9cd2b
  
6f9cd2b
! gui:	nolog $(SCRIPTS) $(SCRIPTS_GUI)
6f9cd2b
  	@echo
6f9cd2b
! 	@cat test.log
6f9cd2b
! 	@echo ALL DONE
6f9cd2b
  
6f9cd2b
  $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
6f9cd2b
  
6f9cd2b
--- 26,42 ----
6f9cd2b
  
6f9cd2b
  .SUFFIXES: .in .out
6f9cd2b
  
6f9cd2b
! nongui:	nolog $(SCRIPTS) report
6f9cd2b
! 
6f9cd2b
! gui:	nolog $(SCRIPTS) $(SCRIPTS_GUI) report
6f9cd2b
  
6f9cd2b
! report:
6f9cd2b
  	@echo
6f9cd2b
! 	@echo 'Test results:'
6f9cd2b
! 	@/bin/sh -c "if test -f test.log; \
6f9cd2b
! 		then cat test.log; echo TEST FAILURE; exit 1; \
6f9cd2b
! 		else echo ALL DONE; \
6f9cd2b
! 		fi"
6f9cd2b
  
6f9cd2b
  $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
6f9cd2b
  
6f9cd2b
***************
6f9cd2b
*** 71,74 ****
6f9cd2b
  test60.out: test60.vim
6f9cd2b
  
6f9cd2b
  nolog:
6f9cd2b
! 	-echo Test results: >test.log
6f9cd2b
--- 73,76 ----
6f9cd2b
  test60.out: test60.vim
6f9cd2b
  
6f9cd2b
  nolog:
6f9cd2b
! 	-rm -f test.log
6f9cd2b
*** ../vim-7.2.014/src/version.c	Wed Sep 10 15:38:13 2008
6f9cd2b
--- src/version.c	Wed Sep 10 18:23:38 2008
6f9cd2b
***************
6f9cd2b
*** 678,679 ****
6f9cd2b
--- 678,681 ----
6f9cd2b
  {   /* Add new patch number below this line */
6f9cd2b
+ /**/
6f9cd2b
+     15,
6f9cd2b
  /**/
6f9cd2b
6f9cd2b
-- 
6f9cd2b
Light travels faster than sound.  This is why some people
6f9cd2b
appear bright until you hear them speak
6f9cd2b
6f9cd2b
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
6f9cd2b
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
6f9cd2b
\\\        download, build and distribute -- http://www.A-A-P.org        ///
6f9cd2b
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///