patch 8.1.0598: indent tests may use the wrong Vim binaryv8.1.0598

Problem:    Indent tests may use the wrong Vim binary.
Solution:   Pass in the just built Vim binary.

1 files changed, 11 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 3e69d4501c..2155b588ac 100644
--- 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)"
 		
 
 #########################################################################