Mercurial > vim
changeset 32593:70db21e91c73 v9.0.1628
patch 9.0.1628: syntax tests fail on FreeBSD
Commit: https://github.com/vim/vim/commit/d5b952a871835b057176fd37fc91b971e8e3f300
Author: K.Takata <kentkt@csc.jp>
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.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 14 Jun 2023 00:00:05 +0200 |
| parents | ad82302f4f75 |
| children | b3dc1ac1ad16 |
| files | Makefile runtime/syntax/Makefile src/version.c |
| diffstat | 3 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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)" #########################################################################
--- 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