summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-12-10 21:36:56 +0100
committerBram Moolenaar <Bram@vim.org>2018-12-10 21:36:56 +0100
commit30700cd5ffa258f1d684ab6b34bd03e970450dba (patch)
tree5f76ff852d4fea42792ab8311bf53d45dbc1c790
parentd47d52232bf21036c5c89081458be7eaf2630d24 (diff)
patch 8.1.0576: indent script tests pick up installed scriptsv8.1.0576
Problem: Indent script tests pick up installed scripts. Solution: Use current runtime indent scripts.
-rw-r--r--runtime/indent/Makefile5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/runtime/indent/Makefile b/runtime/indent/Makefile
index 3791f3348d..1917e46c6b 100644
--- a/runtime/indent/Makefile
+++ b/runtime/indent/Makefile
@@ -1,13 +1,14 @@
# Portable Makefile for running indent tests.
VIM = vim
+VIMRUNTIME = ..
# Run the tests that didn't run yet or failed previously.
# If a test succeeds a testdir/*.out file will be written.
# If a test fails a testdir/*.fail file will be written.
test:
- $(VIM) --clean --not-a-term -u testdir/runtest.vim
+ VIMRUNTIME=$(VIMRUNTIME) $(VIM) --clean --not-a-term -u testdir/runtest.vim
clean:
- $(VIM) --clean --not-a-term -u testdir/cleantest.vim
+ VIMRUNTIME=$(VIMRUNTIME) $(VIM) --clean --not-a-term -u testdir/cleantest.vim
diff --git a/src/version.c b/src/version.c
index 981d9187c4..29fdfb2dd9 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 */
/**/
+ 576,
+/**/
575,
/**/
574,