From d5b952a871835b057176fd37fc91b971e8e3f300 Mon Sep 17 00:00:00 2001 From: "K.Takata" Date: Tue, 13 Jun 2023 22:44:57 +0100 Subject: 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. --- Makefile | 2 +- runtime/syntax/Makefile | 4 ++-- src/version.c | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6e68093bbd..f70fb85293 100644 --- 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 c1ac2734dc..4d0c88980b 100644 --- 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 56425ab2a5..1235ac9439 100644 --- 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, /**/ -- cgit v1.2.3