Skip to content

Commit

Permalink
patch 8.1.1213: "make clean" in top dir does not cleanup indent test …
Browse files Browse the repository at this point in the history
…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)
  • Loading branch information
brammool committed Apr 27, 2019
1 parent 520e245 commit e13a390
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 13 deletions.
7 changes: 6 additions & 1 deletion Makefile
Expand Up @@ -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)"


Expand Down
2 changes: 1 addition & 1 deletion runtime/indent/Makefile
Expand Up @@ -11,4 +11,4 @@ test:


clean:
VIMRUNTIME=$(VIMRUNTIME) $(VIM) --clean --not-a-term -u testdir/cleantest.vim
rm -f testdir/*.fail testdir/*.out
11 changes: 0 additions & 11 deletions runtime/indent/testdir/cleantest.vim

This file was deleted.

2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -767,6 +767,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1213,
/**/
1212,
/**/
Expand Down

0 comments on commit e13a390

Please sign in to comment.