summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-12-15 17:43:42 +0100
committerBram Moolenaar <Bram@vim.org>2018-12-15 17:43:42 +0100
commiteeed665b0ecd917e88e3475c9615d52546aa124d (patch)
treed305ad026ff57604e5680cf702fe2a2ecf6d5fb0
parent72846cfa76fb7e566c49282410163ed0840c91db (diff)
downloadvim-git-eeed665b0ecd917e88e3475c9615d52546aa124d.tar.gz
patch 8.1.0599: without the +eval feature the indent tests don't workv8.1.0599
Problem: Without the +eval feature the indent tests don't work. Solution: Skip the body of the tests.
-rw-r--r--runtime/indent/testdir/cleantest.vim13
-rw-r--r--runtime/indent/testdir/runtest.vim6
-rw-r--r--src/version.c2
3 files changed, 17 insertions, 4 deletions
diff --git a/runtime/indent/testdir/cleantest.vim b/runtime/indent/testdir/cleantest.vim
index 909cf812c..69c0a1d4b 100644
--- a/runtime/indent/testdir/cleantest.vim
+++ b/runtime/indent/testdir/cleantest.vim
@@ -1,6 +1,11 @@
-" Deletes all the test output files: *.fail and *.out
-for fname in glob('testdir/*.out', 1, 1) + glob('testdir/*.fail', 1, 1)
- call delete(fname)
-endfor
+" Only do this with the +eval feature
+if 1
+
+ " Deletes all the test output files: *.fail and *.out
+ for fname in glob('testdir/*.out', 1, 1) + glob('testdir/*.fail', 1, 1)
+ call delete(fname)
+ endfor
+
+endif
quit
diff --git a/runtime/indent/testdir/runtest.vim b/runtime/indent/testdir/runtest.vim
index 1cc0d3f71..96c31453a 100644
--- a/runtime/indent/testdir/runtest.vim
+++ b/runtime/indent/testdir/runtest.vim
@@ -2,6 +2,9 @@
"
" Current directory must be runtime/indent.
+" Only do this with the +eval feature
+if 1
+
set nocp
filetype indent on
set nowrapscan
@@ -116,4 +119,7 @@ for fname in glob('testdir/*.in', 1, 1)
endif
endfor
+" Matching "if 1" at the start.
+endif
+
qall!
diff --git a/src/version.c b/src/version.c
index 7e8b34efe..0231cc8ee 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 599,
+/**/
598,
/**/
597,