patch 9.0.1628: syntax tests fail on FreeBSD

Problem:    Syntax tests fail on FreeBSD.
Solution:   Pass the Vim executable path with VIMPROG. (Ken Takata,
            closes #12535)  Adjust the paths.

diff --git a/Makefile b/Makefile
index 6e68093bbd720b9874db9bda7b541b90b03df368..f70fb852931d9f73db6ec1fcd584180d8c1dea1d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ VIM_FOR_SYNTAXTEST = ../../src/vim
 syntaxtest:
        cd runtime/syntax && \
                $(MAKE) clean && \
-               $(MAKE) test VIM="$(VIM_FOR_SYNTAXTEST)"
+               $(MAKE) test VIMPROG="$(VIM_FOR_SYNTAXTEST)"
 
 
 #########################################################################

diff --git a/runtime/syntax/Makefile b/runtime/syntax/Makefile
index c1ac2734dc188c66f7b5caf3a4cd28821545a41f..4d0c88980b1eeea78662d04963fda022b5ff16b5 100644 (file)
--- a/runtime/syntax/Makefile
+++ b/runtime/syntax/Makefile
@@ -11,14 +11,14 @@ VIMRUNTIME = ../..
 
 # ENVVARS = LC_ALL=C LANG=C LANGUAGE=C
 
-RUN_VIMTEST = VIMRUNTIME=$(VIMRUNTIME) $(VALGRIND) $(ENVVARS) $(VIMPROG) -f $(GUI_FLAG)
+RUN_VIMTEST = VIMRUNTIME=$(VIMRUNTIME) $(VALGRIND) $(ENVVARS) ../$(VIMPROG) -f $(GUI_FLAG)
 
 # Run the tests that didn't run yet or failed previously.
 # If a test succeeds a testdir/done/{name} file will be written.
 # If a test fails a testdir/failed/{name}.dump file will be written.
 test:
        @# the "vimcmd" file is used by the screendump utils
-       @echo "$(VIMPROG)" > testdir/vimcmd
+       @echo "../$(VIMPROG)" > testdir/vimcmd
        @echo "$(RUN_VIMTEST)" >> testdir/vimcmd
        VIMRUNTIME=$(VIMRUNTIME) $(VIMPROG) --clean --not-a-term -u testdir/runtest.vim
 

diff --git a/src/version.c b/src/version.c
index 56425ab2a55422c52f4444b4d7700749233f493e..1235ac94391d316467ed7f4d4b80d95be37067ae 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1628,
 /**/
     1627,
 /**/