summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-04-27 17:57:31 +0200
committerBram Moolenaar <Bram@vim.org>2019-04-27 17:57:31 +0200
commite13a3901cae0afb4d2af30d497696af08029fd81 (patch)
treeb65c945ba6a7e8b831ed1a191a75a678f396b6fc
parent520e245237fa92f9022968a52eb418da6eade9b4 (diff)
downloadvim-git-e13a3901cae0afb4d2af30d497696af08029fd81.tar.gz
patch 8.1.1213: "make clean" in top dir does not cleanup indent test outputv8.1.1213
Problem: "make clean" in top dir does not cleanup indent test output. Solution: Clean the indent test output. Do not rely on the vim executable for that. (closes #4307)
-rw-r--r--Makefile7
-rw-r--r--runtime/indent/Makefile2
-rw-r--r--runtime/indent/testdir/cleantest.vim11
-rw-r--r--src/version.c2
4 files changed, 9 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 16fc84ccd..6ee3b1cdd 100644
--- a/Makefile
+++ b/Makefile
@@ -43,13 +43,18 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
@if test "$@" = "test"; then \
$(MAKE) indenttest; \
fi
+ @# When the target is "clean" also clean for the indent tests.
+ @if test "$@" = "clean" -o "$@" = "distclean" -o "$@" = "testclean"; then \
+ cd runtime/indent && \
+ $(MAKE) clean; \
+ fi
# Executable used for running the indent tests.
VIM_FOR_INDENTTEST = ../../src/vim
indenttest:
cd runtime/indent && \
- $(MAKE) clean VIM="$(VIM_FOR_INDENTTEST)" && \
+ $(MAKE) clean && \
$(MAKE) test VIM="$(VIM_FOR_INDENTTEST)"
diff --git a/runtime/indent/Makefile b/runtime/indent/Makefile
index 1917e46c6..d19260552 100644
--- a/runtime/indent/Makefile
+++ b/runtime/indent/Makefile
@@ -11,4 +11,4 @@ test:
clean:
- VIMRUNTIME=$(VIMRUNTIME) $(VIM) --clean --not-a-term -u testdir/cleantest.vim
+ rm -f testdir/*.fail testdir/*.out
diff --git a/runtime/indent/testdir/cleantest.vim b/runtime/indent/testdir/cleantest.vim
deleted file mode 100644
index 69c0a1d4b..000000000
--- a/runtime/indent/testdir/cleantest.vim
+++ /dev/null
@@ -1,11 +0,0 @@
-" 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/src/version.c b/src/version.c
index 704ff5482..88763e5cf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1213,
+/**/
1212,
/**/
1211,