Patch 9.0.1628

[Bram Moolenaar]

Patch 9.0.1628
Problem: Syntax tests fail on FreeBSD.
Solution: Pass the Vim executable path with VIMPROG. (Ken Takata,
closes #12535) Adjust the paths.
Files: Makefile, runtime/syntax/Makefile


*** ../vim-9.0.1627/Makefile 2023-06-11 19:03:38.581053236 +0100
--- Makefile 2023-06-13 22:18:05.490488690 +0100
***************
*** 66,72 ****
syntaxtest:
cd runtime/syntax && \
$(MAKE) clean && \
! $(MAKE) test VIM="$(VIM_FOR_SYNTAXTEST)"


#########################################################################
--- 66,72 ----
syntaxtest:
cd runtime/syntax && \
$(MAKE) clean && \
! $(MAKE) test VIMPROG="$(VIM_FOR_SYNTAXTEST)"


#########################################################################
*** ../vim-9.0.1627/runtime/syntax/Makefile 2023-06-11 19:03:38.581053236 +0100
--- runtime/syntax/Makefile 2023-06-13 22:41:57.311328346 +0100
***************
*** 11,24 ****

# ENVVARS = LC_ALL=C LANG=C LANGUAGE=C

! 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 "$(RUN_VIMTEST)" >> testdir/vimcmd
VIMRUNTIME=$(VIMRUNTIME) $(VIMPROG) --clean --not-a-term -u testdir/runtest.vim

--- 11,24 ----

# ENVVARS = LC_ALL=C LANG=C LANGUAGE=C

! 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 "$(RUN_VIMTEST)" >> testdir/vimcmd
VIMRUNTIME=$(VIMRUNTIME) $(VIMPROG) --clean --not-a-term -u testdir/runtest.vim

*** ../vim-9.0.1627/src/version.c 2023-06-11 19:03:38.581053236 +0100
--- src/version.c 2023-06-13 22:19:10.446307036 +0100
***************
*** 697,698 ****
--- 697,700 ----
{ /* Add new patch number below this line */
+ /**/
+ 1628,
/**/

--
You're as much use as a condom machine at the Vatican.
-- Rimmer to Holly in Red Dwarf 'Queeg'

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///