patch 7.4.981

Problem:    An error in a test script goes unnoticed.
Solution:   Source the test script inside try/catch. (Hirohito Higashi)

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 0dc142eb97fe1ee8c1519f28bbd33b23ff3ae2fe..cca7c751dfd91f63617f57a788bb620481ca5b8e 100644 (file)
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -21,9 +21,7 @@
 " It will be called after each Test_ function.
 
 " Without the +eval feature we can't run these tests, bail out.
-if 0
-  quit!
-endif
+so small.vim
 
 " Check that the screen size is at least 24 x 80 characters.
 if &lines < 24 || &columns < 80 
@@ -38,7 +36,15 @@ endif
 " Source the test script.  First grab the file name, in case the script
 " navigates away.
 let testname = expand('%')
-source %
+let done = 0
+let fail = 0
+let errors = []
+try
+  source %
+catch
+  let fail += 1
+  call add(errors, 'Caught exception: ' . v:exception . ' @ ' . v:throwpoint)
+endtry
 
 " Locate Test_ functions and execute them.
 redir @q
@@ -46,9 +52,6 @@ function /^Test_
 redir END
 let tests = split(substitute(@q, 'function \(\k*()\)', '\1', 'g'))
 
-let done = 0
-let fail = 0
-let errors = []
 for test in tests
   if exists("*SetUp")
     call SetUp()

diff --git a/src/version.c b/src/version.c
index 262876e2bcd4ea724cf604364e76993e4253229e..ac5bb1f225db832fd6ac926ee707b19814018624 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    981,
 /**/
     980,
 /**/