# HG changeset patch # User Bram Moolenaar # Date 1544891404 -3600 # Node ID ea6f7b224be7ffad5b12cca62f57f5837dce355c # Parent 58e8f4306a6db38e2ba3a8d82496d7865d1d8657 patch 8.1.0598: indent tests may use the wrong Vim binary commit https://github.com/vim/vim/commit/72846cfa76fb7e566c49282410163ed0840c91db Author: Bram Moolenaar Date: Sat Dec 15 17:23:18 2018 +0100 patch 8.1.0598: indent tests may use the wrong Vim binary Problem: Indent tests may use the wrong Vim binary. Solution: Pass in the just built Vim binary. diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -39,10 +39,18 @@ all install uninstall tools config confi @echo "Starting make in the src directory." @echo "If there are problems, cd to the src directory and run make there" cd src && $(MAKE) $@ + # When the target is "test" also run the indent tests. + @if test "$@" = "test"; then \ + $(MAKE) indenttest; \ + fi -test: all - cd src && $(MAKE) test - cd runtime/indent && $(MAKE) clean && $(MAKE) test +# Executable used for running the indent tests. +VIM_FOR_INDENTTEST = ../../src/vim + +indenttest: + cd runtime/indent && \ + $(MAKE) clean VIM="$(VIM_FOR_INDENTTEST)" && \ + $(MAKE) test VIM="$(VIM_FOR_INDENTTEST)" ######################################################################### diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -800,6 +800,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 598, +/**/ 597, /**/ 596,