summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-11-25 04:03:09 +0100
committerBram Moolenaar <Bram@vim.org>2018-11-25 04:03:09 +0100
commitdc2f73a6980be13c97a83047d0de50824bc0f20f (patch)
tree640d3bbee14c7c2891a6e5ca6f35b616f0187fb8
parentb730f0c7ba36492d795f081b19bbcb85cdf0f50f (diff)
patch 8.1.0545: when executing indent tests user preferences interferev8.1.0545
Problem: When executing indent tests user preferences interfere. Solution: Add "--clean".
-rw-r--r--runtime/indent/Makefile4
-rw-r--r--runtime/indent/testdir/runtest.vim4
-rw-r--r--src/version.c2
3 files changed, 7 insertions, 3 deletions
diff --git a/runtime/indent/Makefile b/runtime/indent/Makefile
index fa81db0470..3791f3348d 100644
--- a/runtime/indent/Makefile
+++ b/runtime/indent/Makefile
@@ -6,8 +6,8 @@ VIM = vim
# If a test succeeds a testdir/*.out file will be written.
# If a test fails a testdir/*.fail file will be written.
test:
- $(VIM) --not-a-term -u testdir/runtest.vim
+ $(VIM) --clean --not-a-term -u testdir/runtest.vim
clean:
- $(VIM) --not-a-term -u testdir/cleantest.vim
+ $(VIM) --clean --not-a-term -u testdir/cleantest.vim
diff --git a/runtime/indent/testdir/runtest.vim b/runtime/indent/testdir/runtest.vim
index 5d36512f94..1cc0d3f716 100644
--- a/runtime/indent/testdir/runtest.vim
+++ b/runtime/indent/testdir/runtest.vim
@@ -1,4 +1,6 @@
-" Runs all the indent tests for which there is no .out file
+" Runs all the indent tests for which there is no .out file.
+"
+" Current directory must be runtime/indent.
set nocp
filetype indent on
diff --git a/src/version.c b/src/version.c
index da6243b46f..42ce472dc5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 545,
+/**/
544,
/**/
543,