Skip to content

Commit e13a390

Browse files
committed
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)
1 parent 520e245 commit e13a390

4 files changed

Lines changed: 9 additions & 13 deletions

File tree

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,18 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
4343
@if test "$@" = "test"; then \
4444
$(MAKE) indenttest; \
4545
fi
46+
@# When the target is "clean" also clean for the indent tests.
47+
@if test "$@" = "clean" -o "$@" = "distclean" -o "$@" = "testclean"; then \
48+
cd runtime/indent && \
49+
$(MAKE) clean; \
50+
fi
4651

4752
# Executable used for running the indent tests.
4853
VIM_FOR_INDENTTEST = ../../src/vim
4954

5055
indenttest:
5156
cd runtime/indent && \
52-
$(MAKE) clean VIM="$(VIM_FOR_INDENTTEST)" && \
57+
$(MAKE) clean && \
5358
$(MAKE) test VIM="$(VIM_FOR_INDENTTEST)"
5459

5560

runtime/indent/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ test:
1111

1212

1313
clean:
14-
VIMRUNTIME=$(VIMRUNTIME) $(VIM) --clean --not-a-term -u testdir/cleantest.vim
14+
rm -f testdir/*.fail testdir/*.out

runtime/indent/testdir/cleantest.vim

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,8 @@ static char *(features[]) =
767767

768768
static int included_patches[] =
769769
{ /* Add new patch number below this line */
770+
/**/
771+
1213,
770772
/**/
771773
1212,
772774
/**/

0 commit comments

Comments
 (0)