patch 8.1.1213: "make clean" in top dir does not cleanup indent test output

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)

diff --git a/Makefile b/Makefile
index 16fc84ccdc92d5c8b3214366c9917fed10fe17a6..6ee3b1cddad5c5201725324e98757e09ff77e055 100644 (file)
--- 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 1917e46c6b06b03174d07ac4f642239462bc7242..d1926055270cb886b7806bad016ad02e367de2ba 100644 (file)
--- 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 (file)
index 69c0a1d..0000000
--- 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 704ff5482eb2a31cf10969d1a6b617045d97d4ae..88763e5cfe0a97d926509f750b23c100978d4a61 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1213,
 /**/
     1212,
 /**/