From d6f50fa5b87c515a5d775528ab7cc40289ad03a2 Mon Sep 17 00:00:00 2001
From: edyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Date: Wed, 10 Sep 2008 23:41:08 +0000
Subject: [PATCH] Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1190 2a77ed30-b011-0410-a7ad-c7884a0aa172
---
 src/testdir/Makefile | 18 ++++++++++--------
 src/version.c        |  2 ++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index c7d1b39f..3528bf6f 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -26,15 +26,17 @@ SCRIPTS_GUI = test16.out
 
 .SUFFIXES: .in .out
 
-nongui:	nolog $(SCRIPTS)
-	@echo
-	@cat test.log
-	@echo ALL DONE
+nongui:	nolog $(SCRIPTS) report
+
+gui:	nolog $(SCRIPTS) $(SCRIPTS_GUI) report
 
-gui:	nolog $(SCRIPTS) $(SCRIPTS_GUI)
+report:
 	@echo
-	@cat test.log
-	@echo ALL DONE
+	@echo 'Test results:'
+	@/bin/sh -c "if test -f test.log; \
+		then cat test.log; echo TEST FAILURE; exit 1; \
+		else echo ALL DONE; \
+		fi"
 
 $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
 
@@ -71,4 +73,4 @@ test49.out: test49.vim
 test60.out: test60.vim
 
 nolog:
-	-echo Test results: >test.log
+	-rm -f test.log
diff --git a/src/version.c b/src/version.c
index 099f918f..ac8ada80 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    15,
+/**/
     14,
 /**/
     13,
-- 
2.11.4.GIT