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
index 3e69d4501cf9ecb7336a8f7d65d6120ae8e42cec..2155b588acf8443b86956e9867b43b8a17284b81 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,10 +39,18 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
        @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
+
+# Executable used for running the indent tests.
+VIM_FOR_INDENTTEST = ../../src/vim
 
-test: all
-       cd src && $(MAKE) test
-       cd runtime/indent && $(MAKE) clean && $(MAKE) test
+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
index a85295a6cb988447e486a4c28101420ee8b73198..7e8b34efeb4afa0ead41614fe9932b99b1f8a181 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    598,
 /**/
     597,
 /**/