Mercurial > vim
changeset 16417:e6fb5d39a24c v8.1.1213
patch 8.1.1213: "make clean" in top dir does not cleanup indent test output
commit https://github.com/vim/vim/commit/e13a3901cae0afb4d2af30d497696af08029fd81
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Apr 27 17:57:31 2019 +0200
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 27 Apr 2019 18:00:05 +0200 |
| parents | 5f6b2c27ca41 |
| children | 6f2f820a2f95 |
| files | Makefile runtime/indent/Makefile runtime/indent/testdir/cleantest.vim src/version.c |
| diffstat | 4 files changed, 9 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile +++ b/Makefile @@ -43,13 +43,18 @@ all install uninstall tools config confi @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)"
--- 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
deleted file mode 100644 --- 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