# HG changeset patch # User Bram Moolenaar # Date 1686693605 -7200 # Node ID 70db21e91c73ccdd56ae67d595504f01f20ea654 # Parent ad82302f4f759d71da4fb34a01e05189d7a19a96 patch 9.0.1628: syntax tests fail on FreeBSD Commit: https://github.com/vim/vim/commit/d5b952a871835b057176fd37fc91b971e8e3f300 Author: K.Takata Date: Tue Jun 13 22:44:57 2023 +0100 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 --- 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 --- 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 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1628, +/**/ 1627, /**/ 1626,