mirror of
https://github.com/vim/vim
synced 2025-07-16 01:01:58 +00:00
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)
This commit is contained in:
7
Makefile
7
Makefile
@ -43,13 +43,18 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
|
|||||||
@if test "$@" = "test"; then \
|
@if test "$@" = "test"; then \
|
||||||
$(MAKE) indenttest; \
|
$(MAKE) indenttest; \
|
||||||
fi
|
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.
|
# Executable used for running the indent tests.
|
||||||
VIM_FOR_INDENTTEST = ../../src/vim
|
VIM_FOR_INDENTTEST = ../../src/vim
|
||||||
|
|
||||||
indenttest:
|
indenttest:
|
||||||
cd runtime/indent && \
|
cd runtime/indent && \
|
||||||
$(MAKE) clean VIM="$(VIM_FOR_INDENTTEST)" && \
|
$(MAKE) clean && \
|
||||||
$(MAKE) test VIM="$(VIM_FOR_INDENTTEST)"
|
$(MAKE) test VIM="$(VIM_FOR_INDENTTEST)"
|
||||||
|
|
||||||
|
|
||||||
|
@ -11,4 +11,4 @@ test:
|
|||||||
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
VIMRUNTIME=$(VIMRUNTIME) $(VIM) --clean --not-a-term -u testdir/cleantest.vim
|
rm -f testdir/*.fail testdir/*.out
|
||||||
|
@ -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
|
|
@ -767,6 +767,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1213,
|
||||||
/**/
|
/**/
|
||||||
1212,
|
1212,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user