summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--runtime/indent/testdir/runtest.vim6
-rw-r--r--src/version.c2
3 files changed, 9 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 230401f8ac..0fd5ba0473 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,6 +77,7 @@ src/testdir/messages
src/testdir/viminfo
src/testdir/opt_test.vim
runtime/indent/testdir/*.out
+runtime/indent/testdir/*.fail
src/memfile_test
src/json_test
src/message_test
diff --git a/runtime/indent/testdir/runtest.vim b/runtime/indent/testdir/runtest.vim
index 0f0051415d..9502c42f3e 100644
--- a/runtime/indent/testdir/runtest.vim
+++ b/runtime/indent/testdir/runtest.vim
@@ -20,6 +20,7 @@ func HandleSwapExists()
endif
endfunc
+let failed_count = 0
for fname in glob('testdir/*.in', 1, 1)
let root = substitute(fname, '\.in', '', '')
@@ -110,6 +111,7 @@ for fname in glob('testdir/*.in', 1, 1)
endif
if failed
+ let failed_count += 1
exe 'write ' . root . '.fail'
echoerr 'Test ' . fname . ' FAILED!'
else
@@ -123,4 +125,8 @@ endfor
" Matching "if 1" at the start.
endif
+if failed_count > 0
+ " have make report an error
+ cquit
+endif
qall!
diff --git a/src/version.c b/src/version.c
index 1c7ece3c85..50c1c4cd95 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2056,
+/**/
2055,
/**/
2054,